浏览代码

人员、部门操作添加日志记录

zhaoxian 4 年之前
父节点
当前提交
98f977c18c

+ 244 - 238
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.system.controller;
 import cn.com.ctop.common.module.entity.SysDepart;
 import cn.com.ctop.common.module.model.DepartIdModel;
 import cn.com.ctop.common.module.model.SysDepartTreeModel;
+import cn.com.ctop.common.module.service.ISysBaseApi;
 import cn.com.ctop.common.module.service.ISysDepartService;
 import cn.com.ctop.common.module.service.ISysUserDepartService;
 import cn.com.ctop.common.module.service.ISysUserService;
@@ -47,205 +48,209 @@ import java.util.*;
 @RequestMapping("/sys/sysDepart")
 @Slf4j
 public class SysDepartController {
+    @Autowired
+    private ISysBaseApi sysBaseAPI;
+    @Autowired
+    private ISysDepartService sysDepartService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ISysUserDepartService sysUserDepartService;
+    public RedisTemplate<String, Object> redisTemplate;
 
-	@Autowired
-	private ISysDepartService sysDepartService;
-	@Autowired
-	private ISysUserService sysUserService;
-	@Autowired
-	private ISysUserDepartService sysUserDepartService;
-	public RedisTemplate<String, Object> redisTemplate;
-	/**
-	 * 查询数据 查出我的部门,并以树结构数据格式响应给前端
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/queryMyDeptTreeList", method = RequestMethod.GET)
-	public Result<List<SysDepartTreeModel>> queryMyDeptTreeList() {
-		Result<List<SysDepartTreeModel>> result = new Result<>();
-		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		try {
-			if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){
-				List<SysDepartTreeModel> list = sysDepartService.queryMyDeptTreeList(user.getDepartIds());
-				result.setResult(list);
-				result.setMessage(CommonConstant.USER_IDENTITY_2.toString());
-				result.setSuccess(true);
-			}else{
-				result.setMessage(CommonConstant.USER_IDENTITY_1.toString());
-				result.setSuccess(true);
-			}
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-		}
-		return result;
-	}
+    /**
+     * 查询数据 查出我的部门,并以树结构数据格式响应给前端
+     *
+     * @return
+     */
+    @RequestMapping(value = "/queryMyDeptTreeList", method = RequestMethod.GET)
+    public Result<List<SysDepartTreeModel>> queryMyDeptTreeList() {
+        Result<List<SysDepartTreeModel>> result = new Result<>();
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        try {
+            if (oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2)) {
+                List<SysDepartTreeModel> list = sysDepartService.queryMyDeptTreeList(user.getDepartIds());
+                result.setResult(list);
+                result.setMessage(CommonConstant.USER_IDENTITY_2.toString());
+                result.setSuccess(true);
+            } else {
+                result.setMessage(CommonConstant.USER_IDENTITY_1.toString());
+                result.setSuccess(true);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return result;
+    }
 
-	/**
-	 * 查询数据 查出所有部门,并以树结构数据格式响应给前端
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
-	public Result<List<SysDepartTreeModel>> queryTreeList() {
-		Result<List<SysDepartTreeModel>> result = new Result<>();
-		try {
-			List<SysDepartTreeModel> list = sysDepartService.queryTreeList();
-			result.setResult(list);
-			result.setSuccess(true);
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-		}
-		return result;
-	}
+    /**
+     * 查询数据 查出所有部门,并以树结构数据格式响应给前端
+     *
+     * @return
+     */
+    @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
+    public Result<List<SysDepartTreeModel>> queryTreeList() {
+        Result<List<SysDepartTreeModel>> result = new Result<>();
+        try {
+            List<SysDepartTreeModel> list = sysDepartService.queryTreeList();
+            result.setResult(list);
+            result.setSuccess(true);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return result;
+    }
 
-	/**
-	 * 添加新数据 添加用户新建的部门对象数据,并保存到数据库
-	 *
-	 * @param sysDepart
-	 * @return
-	 */
-	//@RequiresRoles({"admin"})
-	@RequestMapping(value = "/add", method = RequestMethod.POST)
-	@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
-	public Result<SysDepart> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
-		Result<SysDepart> result = new Result<SysDepart>();
-		String username = JwtUtil.getUserNameByToken(request);
-		try {
-			sysDepart.setCreateBy(username);
-			sysDepartService.saveDepartData(sysDepart, username);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
+    /**
+     * 添加新数据 添加用户新建的部门对象数据,并保存到数据库
+     *
+     * @param sysDepart
+     * @return
+     */
+    //@RequiresRoles({"admin"})
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    @CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
+    public Result<SysDepart> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
+        Result<SysDepart> result = new Result<SysDepart>();
+        String username = JwtUtil.getUserNameByToken(request);
+        try {
+            sysDepart.setCreateBy(username);
+            sysDepartService.saveDepartData(sysDepart, username);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
 
-	/**
-	 * 编辑数据 编辑部门的部分数据,并保存到数据库
-	 *
-	 * @param sysDepart
-	 * @return
-	 */
-	//@RequiresRoles({"admin"})
-	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
-	@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
-	public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
-		String username = JwtUtil.getUserNameByToken(request);
-		sysDepart.setUpdateBy(username);
-		Result<SysDepart> result = new Result<SysDepart>();
-		SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId());
-		if (sysDepartEntity == null) {
-			result.error500("未找到对应实体");
-		} else {
-			boolean ok = sysDepartService.updateDepartDataById(sysDepart, username);
-			// TODO 返回false说明什么?
-			if (ok) {
-				result.success("修改成功!");
-			}
-		}
-		return result;
-	}
+    /**
+     * 编辑数据 编辑部门的部分数据,并保存到数据库
+     *
+     * @param sysDepart
+     * @return
+     */
+    //@RequiresRoles({"admin"})
+    @RequestMapping(value = "/edit", method = RequestMethod.PUT)
+    @CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
+    public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
+        sysBaseAPI.addLog("编辑部门,id: " + sysDepart.getId(), 0, 2);
+        String username = JwtUtil.getUserNameByToken(request);
+        sysDepart.setUpdateBy(username);
+        Result<SysDepart> result = new Result<SysDepart>();
+        SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId());
+        if (sysDepartEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = sysDepartService.updateDepartDataById(sysDepart, username);
+            // TODO 返回false说明什么?
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+        return result;
+    }
 
-	 /**
-     *   通过id删除
-    * @param id
-    * @return
-    */
-	//@RequiresRoles({"admin"})
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    //@RequiresRoles({"admin"})
     @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-	@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
-   public Result<SysDepart> delete(@RequestParam(name="id",required=true) String id) {
-
-       Result<SysDepart> result = new Result<SysDepart>();
-       SysDepart sysDepart = sysDepartService.getById(id);
-       if(sysDepart==null) {
-           result.error500("未找到对应实体");
-       }else {
-           boolean ok = sysDepartService.delete(id);
-           if(ok) {
-               result.success("删除成功!");
-           }
-       }
-       return result;
-   }
-
+    @CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
+    public Result<SysDepart> delete(@RequestParam(name = "id", required = true) String id) {
+        sysBaseAPI.addLog("删除部门,id: " + id, 0, 3);
+        Result<SysDepart> result = new Result<SysDepart>();
+        SysDepart sysDepart = sysDepartService.getById(id);
+        if (sysDepart == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = sysDepartService.delete(id);
+            if (ok) {
+                result.success("删除成功!");
+            }
+        }
+        return result;
+    }
 
-	/**
-	 * 批量删除 根据前端请求的多个ID,对数据库执行删除相关部门数据的操作
-	 *
-	 * @param ids
-	 * @return
-	 */
-	//@RequiresRoles({"admin"})
-	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
-	@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
-	public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
 
-		Result<SysDepart> result = new Result<SysDepart>();
-		if (ids == null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		} else {
-			this.sysDepartService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
+    /**
+     * 批量删除 根据前端请求的多个ID,对数据库执行删除相关部门数据的操作
+     *
+     * @param ids
+     * @return
+     */
+    //@RequiresRoles({"admin"})
+    @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
+    @CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
+    public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        sysBaseAPI.addLog("批量删除部门, ids: " + ids, 0, 3);
+        Result<SysDepart> result = new Result<SysDepart>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.sysDepartService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
 
-	/**
-	 * 查询数据 添加或编辑页面对该方法发起请求,以树结构形式加载所有部门的名称,方便用户的操作
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/queryIdTree", method = RequestMethod.GET)
-	public Result<List<DepartIdModel>> queryIdTree() {
-		Result<List<DepartIdModel>> result = new Result<>();
-		try {
-			List<DepartIdModel> list = sysDepartService.queryDepartIdTreeList();
-			result.setResult(list);
-			result.setSuccess(true);
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-		}
-		return result;
-	}
+    /**
+     * 查询数据 添加或编辑页面对该方法发起请求,以树结构形式加载所有部门的名称,方便用户的操作
+     *
+     * @return
+     */
+    @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET)
+    public Result<List<DepartIdModel>> queryIdTree() {
+        Result<List<DepartIdModel>> result = new Result<>();
+        try {
+            List<DepartIdModel> list = sysDepartService.queryDepartIdTreeList();
+            result.setResult(list);
+            result.setSuccess(true);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return result;
+    }
 
-	/**
-	 * <p>
-	 * 部门搜索功能方法,根据关键字模糊搜索相关部门
-	 * </p>
-	 *
-	 * @param keyWord
-	 * @return
-	 */
-	@RequestMapping(value = "/searchBy", method = RequestMethod.GET)
-	public Result<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) {
-		Result<List<SysDepartTreeModel>> result = new Result<List<SysDepartTreeModel>>();
-		//部门查询,myDeptSearch为1时为我的部门查询,登录用户为上级时查只查负责部门下数据
-		LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		String departIds = null;
-		if(oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals( CommonConstant.USER_IDENTITY_2 )){
-			departIds = user.getDepartIds();
-		}
-		List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds);
-		if (treeList == null || treeList.size() == 0) {
-			result.setSuccess(false);
-			result.setMessage("未查询匹配数据!");
-			return result;
-		}
-		result.setResult(treeList);
-		return result;
-	}
+    /**
+     * <p>
+     * 部门搜索功能方法,根据关键字模糊搜索相关部门
+     * </p>
+     *
+     * @param keyWord
+     * @return
+     */
+    @RequestMapping(value = "/searchBy", method = RequestMethod.GET)
+    public Result<List<SysDepartTreeModel>> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord, @RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) {
+        Result<List<SysDepartTreeModel>> result = new Result<List<SysDepartTreeModel>>();
+        //部门查询,myDeptSearch为1时为我的部门查询,登录用户为上级时查只查负责部门下数据
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String departIds = null;
+        if (oConvertUtils.isNotEmpty(user.getUserIdentity()) && user.getUserIdentity().equals(CommonConstant.USER_IDENTITY_2)) {
+            departIds = user.getDepartIds();
+        }
+        List<SysDepartTreeModel> treeList = this.sysDepartService.searhBy(keyWord, myDeptSearch, departIds);
+        if (treeList == null || treeList.size() == 0) {
+            result.setSuccess(false);
+            result.setMessage("未查询匹配数据!");
+            return result;
+        }
+        result.setResult(treeList);
+        return result;
+    }
 
 
-	/**
+    /**
      * 导出excel
      *
      * @param request
      * @param sysDepart
      */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(SysDepart sysDepart,HttpServletRequest request) {
+    public ModelAndView exportXls(SysDepart sysDepart, HttpServletRequest request) {
         // Step.1 组装查询条件
         QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap());
         //Step.2 AutoPoi 导出Excel
@@ -254,15 +259,15 @@ public class SysDepartController {
         //按字典排序
         Collections.sort(pageList, new Comparator<SysDepart>() {
             @Override
-			public int compare(SysDepart arg0, SysDepart arg1) {
-            	return arg0.getOrgCode().compareTo(arg1.getOrgCode());
+            public int compare(SysDepart arg0, SysDepart arg1) {
+                return arg0.getOrgCode().compareTo(arg1.getOrgCode());
             }
         });
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表");
         mv.addObject(NormalExcelConstants.CLASS, SysDepart.class);
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出人:"+user.getRealname(), "导出信息"));
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出人:" + user.getRealname(), "导出信息"));
         mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
         return mv;
     }
@@ -276,11 +281,11 @@ public class SysDepartController {
      */
     //@RequiresRoles({"admin"})
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-	@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
+    @CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-		List<String> errorMessageList = new ArrayList<>();
-		List<SysDepart> listSysDeparts = null;
+        List<String> errorMessageList = new ArrayList<>();
+        List<SysDepart> listSysDeparts = null;
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
             MultipartFile file = entity.getValue();// 获取上传文件对象
@@ -289,50 +294,50 @@ public class SysDepartController {
             params.setHeadRows(1);
             params.setNeedSave(true);
             try {
-            	// orgCode编码长度
-            	int codeLength = 3;
+                // orgCode编码长度
+                int codeLength = 3;
                 listSysDeparts = ExcelImportUtil.importExcel(file.getInputStream(), SysDepart.class, params);
                 //按长度排序
                 Collections.sort(listSysDeparts, new Comparator<SysDepart>() {
                     @Override
-					public int compare(SysDepart arg0, SysDepart arg1) {
-                    	return arg0.getOrgCode().length() - arg1.getOrgCode().length();
+                    public int compare(SysDepart arg0, SysDepart arg1) {
+                        return arg0.getOrgCode().length() - arg1.getOrgCode().length();
                     }
                 });
 
                 int num = 0;
                 for (SysDepart sysDepart : listSysDeparts) {
-                	String orgCode = sysDepart.getOrgCode();
-                	if(orgCode.length() > codeLength) {
-                		String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
-                		QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
-                		queryWrapper.eq("org_code", parentCode);
-                		try {
-                		SysDepart parentDept = sysDepartService.getOne(queryWrapper);
-                		if(!parentDept.equals(null)) {
-							sysDepart.setParentId(parentDept.getId());
-						} else {
-							sysDepart.setParentId("");
-						}
-                		}catch (Exception e) {
-                			//没有查找到parentDept
-                		}
-                	}else{
-                		sysDepart.setParentId("");
-					}
-					sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
-					ImportExcelUtil.importDateSaveOne(sysDepart, ISysDepartService.class, errorMessageList, num, CommonConstant.SQL_INDEX_UNIQ_DEPART_ORG_CODE);
-					num++;
+                    String orgCode = sysDepart.getOrgCode();
+                    if (orgCode.length() > codeLength) {
+                        String parentCode = orgCode.substring(0, orgCode.length() - codeLength);
+                        QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
+                        queryWrapper.eq("org_code", parentCode);
+                        try {
+                            SysDepart parentDept = sysDepartService.getOne(queryWrapper);
+                            if (!parentDept.equals(null)) {
+                                sysDepart.setParentId(parentDept.getId());
+                            } else {
+                                sysDepart.setParentId("");
+                            }
+                        } catch (Exception e) {
+                            //没有查找到parentDept
+                        }
+                    } else {
+                        sysDepart.setParentId("");
+                    }
+                    sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+                    ImportExcelUtil.importDateSaveOne(sysDepart, ISysDepartService.class, errorMessageList, num, CommonConstant.SQL_INDEX_UNIQ_DEPART_ORG_CODE);
+                    num++;
                 }
-				//清空部门缓存
-				Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
-				Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
-				redisTemplate.delete(keys3);
-				redisTemplate.delete(keys4);
-				return ImportExcelUtil.imporReturnRes(errorMessageList.size(), listSysDeparts.size() - errorMessageList.size(), errorMessageList);
+                //清空部门缓存
+                Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
+                Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
+                redisTemplate.delete(keys3);
+                redisTemplate.delete(keys4);
+                return ImportExcelUtil.imporReturnRes(errorMessageList.size(), listSysDeparts.size() - errorMessageList.size(), errorMessageList);
             } catch (Exception e) {
-                log.error(e.getMessage(),e);
-                return Result.error("文件导入失败:"+e.getMessage());
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
             } finally {
                 try {
                     file.getInputStream().close();
@@ -345,22 +350,23 @@ public class SysDepartController {
     }
 
 
-	/**
-	 * 查询所有部门信息
-	 * @return
-	 */
-	@GetMapping("listAll")
-	public Result<List<SysDepart>> listAll(@RequestParam(name = "id", required = false) String id) {
-		Result<List<SysDepart>> result = new Result<>();
-		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
-		query.orderByAsc(SysDepart::getOrgCode);
-		if(oConvertUtils.isNotEmpty(id)){
-			String arr[] = id.split(",");
-			query.in(SysDepart::getId,arr);
-		}
-		List<SysDepart> ls = this.sysDepartService.list(query);
-		result.setSuccess(true);
-		result.setResult(ls);
-		return result;
-	}
+    /**
+     * 查询所有部门信息
+     *
+     * @return
+     */
+    @GetMapping("listAll")
+    public Result<List<SysDepart>> listAll(@RequestParam(name = "id", required = false) String id) {
+        Result<List<SysDepart>> result = new Result<>();
+        LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
+        query.orderByAsc(SysDepart::getOrgCode);
+        if (oConvertUtils.isNotEmpty(id)) {
+            String arr[] = id.split(",");
+            query.in(SysDepart::getId, arr);
+        }
+        List<SysDepart> ls = this.sysDepartService.list(query);
+        result.setSuccess(true);
+        result.setResult(ls);
+        return result;
+    }
 }

+ 5 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -128,7 +128,7 @@ public class SysUserController {
     @RequestMapping(value = "/getAllUser", method = RequestMethod.GET)
     public Result<Object> getAllUser(String status) {
         try {
-            List<SysUserVo> allUser = sysUserService.getAllUser(null,status);
+            List<SysUserVo> allUser = sysUserService.getAllUser(null, status);
             return Result.ok(allUser);
         } catch (Exception e) {
             e.printStackTrace();
@@ -201,7 +201,7 @@ public class SysUserController {
             String companyId = userCompany.getCompanyId();
             List<SysUserVo> userList;
             if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
-                userList = sysUserService.getAllUser(userName,null);
+                userList = sysUserService.getAllUser(userName, null);
             } else {
                 userList = sysUserService.getUserListByCompany(companyId, userName);
             }
@@ -234,7 +234,7 @@ public class SysUserController {
 
             PageHelper.startPage(pageNo, pageSize);
             if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
-                userList = sysUserService.getAllUser(userName,null);
+                userList = sysUserService.getAllUser(userName, null);
             } else {
                 userList = sysUserService.getUserListByCompany(companyId, userName);
             }
@@ -263,7 +263,7 @@ public class SysUserController {
             String companyId = userCompany.getCompanyId();
             List<SysUserVo> userList;
             if ("4b10089775c040119e139087517aed88".equals(companyId) || "6608ed13c0dd42de93c790dbdf124234".equals(companyId) || "d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
-                userList = sysUserService.getAllUser(userName,null);
+                userList = sysUserService.getAllUser(userName, null);
             } else {
                 userList = sysUserService.getUserListByCompany(companyId, userName);
             }
@@ -332,6 +332,7 @@ public class SysUserController {
             sysUserService.addUserWithDepart(user, selectedDeparts);
             userCompanyService.addOrUpdateUserWithCompany(user);
             result.success("添加成功!");
+            sysBaseAPI.addLog("添加用户,id: " + user.getId(), CommonConstant.LOG_TYPE_2, 1);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             result.error500("操作失败");

+ 4 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/SysDepartServiceImpl.java

@@ -4,6 +4,7 @@ import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.mapper.*;
 import cn.com.ctop.common.module.model.DepartIdModel;
 import cn.com.ctop.common.module.model.SysDepartTreeModel;
+import cn.com.ctop.common.module.service.ISysBaseApi;
 import cn.com.ctop.common.module.service.ISysDepartRoleService;
 import cn.com.ctop.common.module.service.ISysDepartService;
 import cn.com.ctop.common.module.utils.Check;
@@ -33,7 +34,8 @@ import java.util.*;
  */
 @Service
 public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart> implements ISysDepartService {
-
+    @Autowired
+    private ISysBaseApi sysBaseAPI;
     @Resource
     private SysUserDepartMapper userDepartMapper;
     @Autowired
@@ -133,6 +135,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
             sysDepart.setCreateTime(new Date());
             sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
             this.save(sysDepart);
+            sysBaseAPI.addLog("添加部门,id: " + sysDepart.getId(), 0, 1);
         }
 
     }