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

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java

@@ -63,15 +63,23 @@ public class SysOrgController {
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取组织分页")
     @GetMapping("/sys/org/queryList")
-    public CommonResult<List<SysOrg>> queryList() {
-        return CommonResult.data(sysOrgService.queyrList());
+    public CommonResult<List<SysOrg>> queryList(HttpServletRequest req) {
+        Map param=new HashMap();
+        String category="COLLEGE";
+        if(StringUtils.isNotEmpty(req.getParameter("category")))category=req.getParameter("category");
+        param.put("category",category);
+        return CommonResult.data(sysOrgService.queyrList(param));
     }
 
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取-业务用组织分页")
     @GetMapping("/bus/org/queryList")
-    public CommonResult<List<SysOrg>> queryBusList() {
-        return CommonResult.data(sysOrgService.queyrList());
+    public CommonResult<List<SysOrg>> queryBusList(HttpServletRequest req) {
+        Map param=new HashMap();
+        String category="COLLEGE";
+        if(StringUtils.isNotEmpty(req.getParameter("category")))category=req.getParameter("category");
+        param.put("category",category);
+        return CommonResult.data(sysOrgService.queyrList(param));
     }
 
 
@@ -220,41 +228,48 @@ public class SysOrgController {
         param.put("category",req.getParameter("category"));
         param.put("eduIdentity",req.getParameter("eduIdentity"));
 
-        Map result = new HashMap();
-        String collegeParentId = "0";
-        if(StringUtils.isNotEmpty(req.getParameter("collegeParentId")))collegeParentId=req.getParameter("collegeParentId");
-        //用于装当前单位的map
-        Map nowData = new HashMap();
-        List<Map<String, Object>> tree = new ArrayList<>();
-        //最终用来化成树的集合
-        List<Map<String,Object>> dataList=new ArrayList<>();
-        //查询该父级id的子级院系
-        List<Map<String,Object>> orgList=sysOrgService.getOrgUserChildList(param);
-        List<Map<String,Object>> userList=sysUserService.getOrgUserChildList(param);
-        dataList.addAll(orgList);
-        dataList.addAll(userList);
-        for(Map one:dataList)
-        {
-            if(one.get("id").equals(collegeParentId))
+        List<Map<String,Object>> resultList= null;
+        try {
+            Map result = new HashMap();
+            String collegeParentId = "0";
+            if(StringUtils.isNotEmpty(req.getParameter("collegeParentId")))collegeParentId=req.getParameter("collegeParentId");
+            //用于装当前单位的map
+            Map nowData = new HashMap();
+            List<Map<String, Object>> tree = new ArrayList<>();
+            //最终用来化成树的集合
+            List<Map<String,Object>> dataList=new ArrayList<>();
+            //查询该父级id的子级院系
+            List<Map<String,Object>> orgList=sysOrgService.getOrgUserChildList(param);
+            List<Map<String,Object>> userList=sysUserService.getOrgUserChildList(param);
+            System.out.println("----------------------------------------------------------------组织人员树数据打印开始");
+            dataList.addAll(orgList);
+            dataList.addAll(userList);
+            for(Map one:dataList)
             {
-                nowData=one;
-                break;
+                if(one.get("id").equals(collegeParentId))
+                {
+                    nowData=one;
+                    break;
+                }
+                System.out.println("----------------------------------------------------------------组织人员树数据打印逐条数据"+one);
             }
-
-        }
-        tree = TreeUtil.getThree(dataList,collegeParentId);
-
-        //如果传进来的id不为空，则把传进来的id也作为一条数据
-        List<Map<String,Object>> resultList=new ArrayList<>();
-        if(nowData.get("id")!=null)
-        {
-            nowData.put("children",tree);
-            resultList.add(nowData);
-            result.put("result",resultList);
-        }
-        else
-        {
-            resultList.addAll(tree);
+            tree = TreeUtil.getThree(dataList,collegeParentId);
+            System.out.println("----------------------------------------------------------------组织人员树数据打印树数据"+tree);
+            System.out.println("----------------------------------------------------------------组织人员树数据打印结束");
+            //如果传进来的id不为空，则把传进来的id也作为一条数据
+            resultList = new ArrayList<>();
+            if(nowData.get("id")!=null)
+            {
+                nowData.put("children",tree);
+                resultList.add(nowData);
+                result.put("result",resultList);
+            }
+            else
+            {
+                resultList.addAll(tree);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return CommonResult.data(resultList);
     }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/service/SysOrgService.java

@@ -196,6 +196,6 @@ public interface SysOrgService extends IService<SysOrg> {
      * */
     List<Map<String, Object>> getOrgUserChildList(Map param);
 
-    List<SysOrg> queyrList();
+    List<SysOrg> queyrList(Map param);
 }
 

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java

@@ -365,9 +365,12 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
     @Override
-    public List<SysOrg> queyrList() {
+    public List<SysOrg> queyrList(Map param) {
         LambdaQueryWrapper<SysOrg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(SysOrg::getCategory, "COLLEGE");
+        if(ObjectUtil.isNotEmpty(param.get("category")))
+        {
+            lambdaQueryWrapper.eq(SysOrg::getCategory, param.get("category"));
+        }
         lambdaQueryWrapper.orderByAsc(SysOrg::getSortCode);
         return sysOrgMapper.selectList(lambdaQueryWrapper);
     }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/mapper/mapping/SysUserMapper.xml

@@ -26,7 +26,7 @@
         SELECT
             t1.ID AS id,
             t1.NAME AS name,
-            IFNULL(t1.COLLEGE_THREE_ID,'')  AS parentId,
+            IFNULL(t1.ORG_ID,'')  AS parentId,
             'user' AS infoType
         FROM SYS_USER t1
         WHERE t1.DELETE_FLAG = 'NOT_DELETE'

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserAddParam.java

@@ -45,7 +45,6 @@ public class SysUserAddParam {
 
     /** 职位id */
     @ApiModelProperty(value = "职位id", required = true, position = 4)
-    @NotBlank(message = "positionId不能为空")
     private String positionId;
 
     /** 职级 */

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserEditParam.java

@@ -50,7 +50,6 @@ public class SysUserEditParam {
 
     /** 职位id */
     @ApiModelProperty(value = "职位id", required = true, position = 5)
-    @NotBlank(message = "positionId不能为空")
     private String positionId;
 
     /** 职级 */