Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -303,4 +305,17 @@ public class WhiteController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    @PostMapping(value = "/sys-find-user/list")
+    @ApiOperation(value = "查询用户列表信息",notes = "查询用户列表信息")
+    public ResultBean findSysUserInfoList(UserDetailModel model){
+        try {
+            List<SysUser> userList = personnelService.querySysUserByUserDetailModelOrIds(model, new ArrayList<>());
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(userList);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

pom.xml

@@ -100,6 +100,13 @@
                 <artifactId>i3plus-platform-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>i3plus.platform</groupId>
+                <artifactId>i3plus-platform-plugin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-platform</artifactId>