bugfix

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/entity/User.java

@@ -8,10 +8,7 @@ import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 @ToString

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/UserService.java

@@ -2,6 +2,7 @@ package cn.efunbox.manage.base.service;
 
 import cn.efunbox.manage.base.entity.User;
 import cn.efunbox.manage.base.vo.UserVo;
+import cn.efunbox.manage.common.entity.page.OnePage;
 import cn.efunbox.manage.common.result.ApiResult;
 
 import java.util.List;
@@ -9,9 +10,11 @@ import java.util.List;
 public interface UserService {
     ApiResult<UserVo> login(String userName, String password);
 
-    ApiResult<User> saveUser(User cmsUser);
+    ApiResult<User> saveUser(User User);
 
-    ApiResult<User> updateUser(User cmsUser);
+    ApiResult<User> updateUser(User User);
 
     ApiResult<User> deleteUserByIds(List<String> ids);
+
+    ApiResult<OnePage<User>> list(User user, Integer pageNo, Integer pageSize);
 }

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/ManageServiceImpl.java

@@ -138,12 +138,18 @@ public class ManageServiceImpl implements ManageService {
 //                    productIds.add(m.getProductId());
 //                }
 //            }
+            if(Objects.nonNull(m.getProductId())){
+                productIds.add(m.getProductId());
+            }
             if(Objects.nonNull(m.getCostTypeId())){
                 costTypeIds.add(m.getCostTypeId());
             }
             if(Objects.nonNull(m.getToProjectId())){
                 projectIds.add(m.getToProjectId());
             }
+            if(Objects.nonNull(m.getToDeptId())){
+                deptIds.add(m.getToDeptId());
+            }
         });
         //部门
         List<Department> departments = departmentRepository.findByIds(deptIds);

efunbox-base/efunbox-base-api/src/main/java/cn/efunbox/manage/base/service/impl/UserServiceImpl.java

@@ -5,6 +5,7 @@ import cn.efunbox.manage.base.enums.BaseStatusEnum;
 import cn.efunbox.manage.base.repository.UserRepository;
 import cn.efunbox.manage.base.service.UserService;
 import cn.efunbox.manage.base.vo.UserVo;
+import cn.efunbox.manage.common.entity.page.OnePage;
 import cn.efunbox.manage.common.result.ApiCode;
 import cn.efunbox.manage.common.result.ApiResult;
 import cn.efunbox.manage.common.utils.BeanUtil;
@@ -29,10 +30,10 @@ public class UserServiceImpl implements UserService {
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
         User User = userRepository.findByUserNameAndStatus(userName, BaseStatusEnum.NORMAL);
-        String MD5Password = User.getPassword();
         if(User==null){
             return ApiResult.error(ApiCode.NO_UID);
         }
+        String MD5Password = User.getPassword();
         if(StringUtils.isBlank(MD5Password)|| !MD5Password.equals(MD5.MD5Encode(password))){
             return ApiResult.error(ApiCode.PASSWORD_ERROR);
         }
@@ -42,21 +43,21 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public ApiResult<User> saveUser(User User) {
+    public ApiResult<User> saveUser(User user) {
 
-        String userName = User.getUserName();
-        String password = User.getPassword();
-        if(User==null||StringUtils.isBlank(userName)||StringUtils.isBlank(password)){
+        String userName = user.getUserName();
+        String password = user.getPassword();
+        if(user==null||StringUtils.isBlank(userName)||StringUtils.isBlank(password)){
             return ApiResult.error(ApiCode.PARAMETER_ERROR);
         }
         User repeatUser = userRepository.findByUserNameAndStatus(userName, BaseStatusEnum.NORMAL);
         if(repeatUser!=null){
             return ApiResult.error(ApiCode.USERNAME_REPEAT);
         }
-        User.setStatus(BaseStatusEnum.NORMAL);
-        User.setPassword(MD5.getMD5Str(password));
-        userRepository.save(User);
-        return ApiResult.ok(User);
+        user.setStatus(BaseStatusEnum.NORMAL);
+        user.setPassword(MD5.getMD5Str(password));
+        userRepository.save(user);
+        return ApiResult.ok(user);
     }
 
     @Override
@@ -81,4 +82,26 @@ public class UserServiceImpl implements UserService {
         userRepository.updateStatusByIds(ids,BaseStatusEnum.DEL);
         return ApiResult.ok();
     }
+
+    @Override
+    public ApiResult<OnePage<User>> list(User user, Integer pageNo, Integer pageSize) {
+
+        long count = userRepository.count(user);
+
+        OnePage<User> onePage = new OnePage<>(count,pageNo,pageSize);
+
+        if (count == 0) {
+            return ApiResult.ok(onePage);
+        }
+
+        List<User> userList = userRepository.find(
+                user,
+                onePage.getStart(),
+                onePage.getPageSize()
+        );
+
+        onePage.setList(userList);
+
+        return ApiResult.ok(onePage);
+    }
 }

efunbox-base/efunbox-base-web/src/main/java/cn/efunbox/manage/base/controller/LoginController.java

@@ -17,7 +17,7 @@ import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 @RestController
-@RequestMapping("/")
+@RequestMapping("/user")
 public class LoginController {
 
     @Autowired