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

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DeptController.java

@@ -69,6 +69,7 @@ public class DeptController {
 	 * 返回当前用户树形菜单集合
 	 * @return 树形菜单
 	 */
+	@SysLog("返回当前用户树形菜单")
 	@GetMapping(value = "/user-tree")
 	public R<List<Tree<Long>>> listCurrentUserDeptTrees() {
 		return R.ok(sysDeptService.listCurrentUserDeptTrees());
@@ -115,6 +116,7 @@ public class DeptController {
 	 * @param deptname 部门名
 	 * @return
 	 */
+	@SysLog("根据部门名查询部门信息")
 	@GetMapping("/details/{deptname}")
 	public R<SysDept> user(@PathVariable String deptname) {
 		SysDept condition = new SysDept();

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DictController.java

@@ -140,6 +140,7 @@ public class DictController {
 	 * @param id id
 	 * @return R
 	 */
+	@SysLog("通过id查询字典项")
 	@GetMapping("/item/{id:\\d+}")
 	public R<SysDictItem> getDictItemById(@PathVariable("id") Long id) {
 		return R.ok(sysDictItemService.getById(id));
@@ -193,6 +194,7 @@ public class DictController {
 	 * @param parentId 父节点ID
 	 * @return 树形菜单
 	 */
+	@SysLog("返回树形字典集合")
 	@GetMapping(value = "/tree")
 	public R<List<Tree<Long>>> getTree(boolean lazy, Long parentId) {
 		return R.ok(sysDictItemService.treeMenu(lazy, parentId));

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysRoleServiceImpl.java

@@ -85,7 +85,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 		SysUserRole userRole =sysUserRoleMapper.selectOne(Wrappers.<SysUserRole>query().lambda()
 				.eq(SysUserRole::getRoleId,sysRole.getRoleId()).last(CommonConstants.LAST_ONE_SQL));
 		//已存在用户
-		Assert.state(!Common.isEmpty(userRole),MsgUtils.getMessage(ErrorCodes.SYS_ROLE_DELETE_EXIST_USER));
+		Assert.state(Common.isEmpty(userRole),MsgUtils.getMessage(ErrorCodes.SYS_ROLE_DELETE_EXIST_USER));
 		//系统内置
 		Assert.state(!CommonConstants.ZERO_String.equals(sysRole.getSystemFlag()),MsgUtils.getMessage(ErrorCodes.SYS_ROLE_DELETE_SYSTEM));
 		sysRoleMenuMapper.delete(Wrappers.<SysRoleMenu>update().lambda().eq(SysRoleMenu::getRoleId, id));