添加同步删除事项接口

base-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -11,6 +11,11 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.base.framework.annotation.Operlog;
+import com.mortals.xhx.base.system.role.model.RoleQuery;
+import com.mortals.xhx.base.system.role.model.RoleUserEntity;
+import com.mortals.xhx.base.system.role.model.RoleUserQuery;
+import com.mortals.xhx.base.system.role.service.RoleService;
+import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.UserStatus;
@@ -26,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
@@ -37,6 +43,12 @@ import java.util.Map;
 @RequestMapping("user")
 public class UserController extends BaseCRUDJsonBodyMappingController<UserService, UserEntity, Long> {
 
+
+    @Autowired
+    private RoleService roleService;
+    @Autowired
+    private RoleUserService roleUserService;
+
     public UserController() {
         super.setModuleDesc("用户信息");
     }
@@ -46,6 +58,8 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         Map<String, Object> statsus = new HashMap<String, Object>();
         statsus.put("userType", IBaseEnum.getEnumMap(UserType.class));
         statsus.put("status", UserStatus.getEnumMap());
+        this.addDict(model, "roleIds", roleService.find(new RoleQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName())));
+
         model.put(KEY_RESULT_DICT, statsus);
     }
 
@@ -59,14 +73,15 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         }
     }
 
-/*    @Override
-    protected void saveBefore(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
-        if (!ObjectUtils.isEmpty(entity.getLoginName())&&service.existUser(entity.getLoginName(), entity.getId())) {
-            throw new AppException("登录名已存在！");
-        }
-        super.saveBefore(entity, model, context);
-    }*/
 
+    @Override
+    protected int editAfter(Long id, Map<String, Object> model, UserEntity entity, Context context) throws AppException {
+        RoleUserQuery roleUserQuery = new RoleUserQuery();
+        roleUserQuery.setUserId(entity.getId());
+        String roleIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getRoleId).map(String::valueOf).collect(Collectors.joining(","));
+        entity.setRoleIds(roleIds);
+        return super.editAfter(id, model, entity, context);
+    }
 
     @RequestMapping(value = "change/password", method = RequestMethod.POST)
     @Operlog(msg = "密码修改成功!")