Merge branch 'test' into patch-dependency

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java

@@ -413,11 +413,10 @@ public interface ISysUserService {
     /**
      * 根据andon查询model查询用户信息
      * @param andonQueryUserModel
-     * @param pager
      * @return
      */
     @ApiOperation(value = "根据andon查询model查询用户信息")
-    ListPager<AndonQueryUserResultModel> findUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel, Pager pager);
+    ListPager<AndonQueryUserResultModel> findUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel);
 
     /**
      * 转换sysUser to AndonQueryUserResultModel

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java

@@ -38,7 +38,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.text.StrBuilder;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -879,18 +878,18 @@ public class SysUserController extends CoreBaseController {
         }
     }
 
-    @GetMapping(value = "/query-user-andonQueryUserModel")
+    @PostMapping(value = "/query-user-andonQueryUserModel")
     @ApiOperation(value = "根据andonQueryUserModel查询系统用户")
-    public ResultBean queryUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel, Pager pager) {
+    public ResultBean queryUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel) {
         try {
             ValidatorBean.checkNotNull(andonQueryUserModel);
             if (StringUtils.isBlank(andonQueryUserModel.getOrganizeCode())) {
                 andonQueryUserModel.setOrganizeCode(AuthUtil.getOrganizeCode());
             }
-            if (ObjectUtils.isEmpty(pager)) {
+            if (ObjectUtils.isEmpty(andonQueryUserModel.getPager())) {
-                pager = Pager.defaultPager();
+                andonQueryUserModel.setPager( Pager.defaultPager());
             }
-            ListPager<AndonQueryUserResultModel> resultList = sysUserService.findUserByAndonQueryUserModel(andonQueryUserModel, pager);
+            ListPager<AndonQueryUserResultModel> resultList = sysUserService.findUserByAndonQueryUserModel(andonQueryUserModel);
             return ResultBean.success("操作成功").setListPager(resultList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -1027,13 +1027,13 @@ public class SysUserService implements ISysUserService {
     }
 
     @Override
-    public ListPager<AndonQueryUserResultModel> findUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel, Pager pager) {
+    public ListPager<AndonQueryUserResultModel> findUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(andonQueryUserModel.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(andonQueryUserModel.getOrganizeCode(), "organizeCode", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(andonQueryUserModel.getDepartment(), "departmentNameRdd", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(andonQueryUserModel.getUserLoginName(), "userLoginName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(andonQueryUserModel.getUserName(), "userName", ddlPackBean);
-        pager = PagerHelper.getPager(pager, userRDao.findByHqlWhereCount(ddlPackBean));
+        Pager   pager = PagerHelper.getPager(andonQueryUserModel.getPager(), userRDao.findByHqlWhereCount(ddlPackBean));
         return new ListPager(packAndonQueryUserResultModel(userRDao.findByHqlWherePage(ddlPackBean, pager)), pager);
     }
 
@@ -1044,13 +1044,13 @@ public class SysUserService implements ISysUserService {
         }
 
         return sysUserList.stream().map(el -> {
-            AndonQueryUserResultModel andonQueryUserModel = new AndonQueryUserResultModel();
+            AndonQueryUserResultModel andonQueryUserResultModel = new AndonQueryUserResultModel();
-            andonQueryUserModel.setDepartment(el.getDepartmentNameRdd());
+            andonQueryUserResultModel.setDepartment(el.getDepartmentNameRdd());
-            andonQueryUserModel.setLoginName(el.getUserLoginName());
+            andonQueryUserResultModel.setLoginName(el.getUserLoginName());
-            andonQueryUserModel.setUserId(el.getId());
+            andonQueryUserResultModel.setUserId(el.getId());
-            andonQueryUserModel.setUserInfoId(el.getUserInfoId());
+            andonQueryUserResultModel.setUserInfoId(el.getUserInfoId());
-            andonQueryUserModel.setUserName(el.getUserName());
+            andonQueryUserResultModel.setUserName(el.getUserName());
-            return andonQueryUserModel;
+            return andonQueryUserResultModel;
         }).collect(Collectors.toList());
     }