diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 314e27bca..a2cc80839 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -73,7 +73,7 @@ import java.util.stream.Collectors; public class SysUserController { @Autowired private ISysBaseAPI sysBaseAPI; - + @Autowired private ISysUserService sysUserService; @@ -833,7 +833,7 @@ public class SysUserController { } return result; } - + /** * 查询当前用户的所有部门/当前部门编码 * @return @@ -857,12 +857,12 @@ public class SysUserController { return result; } - + /** * 用户注册接口 - * + * * @param jsonObject * @param user * @return @@ -973,7 +973,7 @@ public class SysUserController { result.setMessage("验证失败"); return result; } - + /** * 用户手机号验证 */ @@ -1001,7 +1001,7 @@ public class SysUserController { result.setSuccess(true); return result; } - + /** * 用户更改密码 */ @@ -1045,11 +1045,11 @@ public class SysUserController { return result; } } - + /** * 根据TOKEN获取用户的部分信息(返回的数据是可供表单设计器使用的数据) - * + * * @return */ @RequiresPermissions("sys:user:list") @@ -1061,7 +1061,7 @@ public class SysUserController { if (oConvertUtils.isEmpty(token)) { username = JwtUtil.getUserNameByToken(request); } else { - username = JwtUtil.getUsername(token); + username = JwtUtil.getUsername(token); } log.debug(" ------ 通过令牌获取部分用户信息,当前用户: " + username); @@ -1082,7 +1082,7 @@ public class SysUserController { return Result.error(500, "查询失败:" + e.getMessage()); } } - + /** * 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配 * @param keyword @@ -1120,7 +1120,7 @@ public class SysUserController { log.error(e.getMessage(), e); return Result.error(500, "查询失败:" + e.getMessage()); } - + } /** @@ -1369,6 +1369,7 @@ public class SysUserController { * * @return */ + @ApiOperation(value = "树形") @RequestMapping(value = "/queryDepartUserTreeList", method = RequestMethod.GET) public Result> queryDepartUserTreeList() { Result> result = new Result<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 2d7ca648e..1f7ded078 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -27,6 +27,7 @@ import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.domain.service.DomainUserRelService; +import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.log.entity.BussLogEO; import com.jero.modules.log.service.IBussLogEOService; import com.jero.modules.message.websocket.WebSocket; @@ -137,6 +138,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl