修改删除功能所需要的响应数据

common/src/main/java/com/huaxu/model/Permission.java

@@ -48,8 +48,10 @@ public class Permission {
     @ApiModelProperty(value="是否是菜单",position = 11)
     private Boolean isMenu;
 
-    @ApiModelProperty(value="是否是菜单",position = 12)
+    @ApiModelProperty(value="角色id",position = 12)
     private Integer roleId;
+    @ApiModelProperty(value="角色状态",position = 13)
+    private Integer roleState;
 
     @JsonIgnore
     @ApiModelProperty(value="状态",hidden = true)

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -47,6 +47,7 @@ public enum ResultStatus {
     ORG_PARENT_ERROR(300007,"上级机构为部门，请先修改上级机构类型或更换上级机构"),
     ROLE_HAS_USER(300004,"请先解除用户与此角色绑定关系"),
     USERGROUP_HAS_USER(300005,"请先解除用户与此用户组绑定关系"),
+    ROLE_HAS_DISABLE(300008,"该用户角色已经被禁用，无法登录"),
 
     //400 工作流模块
     PROCESS_DEPLOY_FAILED(400006,"流程部署失败"),

user_auth/src/main/java/com/huaxu/controller/UserController.java

@@ -58,8 +58,12 @@ public class UserController {
         user.setPhone(mobile);
         user.setTenantId(tenatId);
       ;
+        List<UserDto> userDtos = userService.chooseUser(user);
+        if(userDtos==null){
+            return new AjaxMessage<>(ResultStatus.ROLE_HAS_DISABLE);
+        }
 
-        return new AjaxMessage<>(ResultStatus.OK,userService.chooseUser(user));
+        return new AjaxMessage<>(ResultStatus.OK,userDtos);
     }
     /**
      * 退出

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -184,6 +184,11 @@ public class UserServiceImpl implements UserService {
         List<ProgramItem>programItems=new ArrayList<>();
 
         Permission permission=new Permission();
+        permission.setPermissionType(2);
+       /* permission.setRoleState(-1);
+        if(permission.getRoleState()==-1){
+            return null;
+        }*/
         getDataPermission(permission.getPermissionType(),user,programItems);
         //角色必须是ROLE_开头，其余的是用户功能权限
         /* List<Permission> permissionList =findPermission(user);
@@ -234,7 +239,7 @@ public class UserServiceImpl implements UserService {
             programItem.setOrgId(user.getCompanyOrgId());
             programItemList.add(programItem);
         }else if(permissionType==2){
-            Map<Integer, List<Org>> allOrgs = getAllOrgs("company");
+            Map<Integer, List<Org>> allOrgs = getAllOrgs("company",user.getTenantId());
             getOrg(user.getCompanyOrgId(),allOrgs,programItemList);
 
         }else if(permissionType==3){
@@ -242,17 +247,20 @@ public class UserServiceImpl implements UserService {
             programItem.setOrgId(user.getDeptOrgId());
             programItemList.add(programItem);
         }else if(permissionType==4) {
-            Map<Integer, List<Org>> allOrgs = getAllOrgs("department");
-            getOrg(user.getCompanyOrgId(),allOrgs,programItemList);
+            Map<Integer, List<Org>> allOrgs = getAllOrgs("department",user.getTenantId());
+            getOrg(user.getDeptOrgId(),allOrgs,programItemList);
 
         }else if(permissionType==5){
             programItemList= userMapper.findOrgRole(user);
         }
 
     }
-    private    Map<Integer, List<Org>> getAllOrgs(String orgType){
+    private    Map<Integer, List<Org>> getAllOrgs(String orgType,String tenantId){
         Org org=new Org();
-        org.setOrgType(orgType);
+        if(org.equals("department")){
+            org.setOrgType(orgType);
+        }
+        org.setTenantId(tenantId);
         List<Org> orgs = userMapper.findOrgs(org);
         Map<Integer, List<Org>> collect = orgs.stream().
                 collect(Collectors.groupingBy(d -> d.getParentOrgId()));

user_auth/src/main/resources/mapper/UserMapper.xml

@@ -237,7 +237,7 @@
     </select>
     <select id="findPermission" resultType="com.huaxu.model.Permission">
         select e.NAME,e.MENU_IMAGE overIcon,e.LINK_PATH path,e.id,e.PARENT_MENU_ID parentId
-          e.PERMISSION_FLAG permission, c.PERMISSION_TYPE ,c.id roleId
+          e.PERMISSION_FLAG permission, c.PERMISSION_TYPE ,c.id roleId,c.ROLE_STATE roleState
           from uims_user a join uims_user_role b on a.id=b.USER_ID
         join uims_role c on b.ROLE_ID= c.ID
         join uims_role_menu d on c.ID=d.ROLE_ID
@@ -256,15 +256,19 @@
          CREATE_BY, DATE_UPDATE, UPDATE_BY
          from uims_org
          <where>
-            and ORG_TYPE=#{orgType}
+             <if test="orgType != null and orgType != ''">
+                 and ORG_TYPE=#{orgType}
+             </if>
+
             and TENANT_ID=#{tenantId}
+            and status!=-1
          </where>
 
     </select>
     <select id="findLoginInfo" resultType="com.huaxu.dto.UserDto">
         select a.id, a.PHONE,b.TENANT_NAME,b.code tenantId,b.WEB_URL ,b.LOGO
         from uims_user a left join uims_tenant b on
-        a.TENANT_ID=b.ID
+        a.TENANT_ID=b.CODE
         where a.PHONE=#{phone}
     </select>
 

user_center/src/main/java/com/huaxu/controller/OrgController.java

@@ -56,7 +56,7 @@ public class OrgController {
      * @return Response对象
      */
     @RequestMapping(value = "insert", method = RequestMethod.POST)
-    @ApiOperation(value = "插入机构")
+    @ApiOperation(value = "插入机构",notes = "orgType 为company或department")
     public AjaxMessage<Integer> insert(@ApiParam(value = "设置配置", required = true) @RequestBody Org org) {
 
         int result = orgService.insert(org);
@@ -71,7 +71,7 @@ public class OrgController {
      * @return Response对象
      */
     @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ApiOperation(value = "更改机构/删除机构",notes = "将状态设为-1即为删除")
+    @ApiOperation(value = "更改机构",notes = "orgType 为company或department")
     public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody Org org) {
         int result = orgService.update(org);
         if(result==-1){
@@ -107,8 +107,8 @@ public class OrgController {
         return new AjaxMessage<>(ResultStatus.OK, orgService.getTrees(org));
     }
     @RequestMapping(value = "deleteAll", method = RequestMethod.POST)
-    @ApiOperation(value = "查询角色对应user")
-    AjaxMessage<Integer> deleteAll(@ApiParam(value = "角色id", required = true)@RequestBody List<Integer> ids){
+    @ApiOperation(value = "删除机构")
+    AjaxMessage<List<String>> deleteAll(@ApiParam(value = "机构id", required = true)@RequestBody List<Integer> ids){
 
         return new AjaxMessage<>(ResultStatus.OK,
                 orgService.deleteAll(ids));

user_center/src/main/java/com/huaxu/controller/RoleController.java

@@ -72,7 +72,7 @@ public class RoleController {
      * @return Response对象
      */
     @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ApiOperation(value = "更新/删除角色",notes = "将状态设为1即为删除")
+    @ApiOperation(value = "更新角色")
     public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody RoleRequestDto role) {
         int result = roleService.update(role);
         if(result==-1){
@@ -109,8 +109,8 @@ public class RoleController {
               roleService.findUsersByRole(role) );
     }
     @RequestMapping(value = "deleteAll", method = RequestMethod.POST)
-    @ApiOperation(value = "查询角色对应user")
-    AjaxMessage<Integer> deleteAll(@ApiParam(value = "角色id", required = true)@RequestBody List<Integer> ids){
+    @ApiOperation(value = "删除角色")
+    AjaxMessage<List<String>> deleteAll(@ApiParam(value = "角色id", required = true)@RequestBody List<Integer> ids){
 
         return new AjaxMessage<>(ResultStatus.OK,
                 roleService.deleteAll(ids));

user_center/src/main/java/com/huaxu/controller/UserGroupController.java

@@ -69,7 +69,7 @@ public class UserGroupController {
      * @return Response对象
      */
     @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ApiOperation(value = "更新/删除用户组",notes = "将状态设为1即为删除")
+    @ApiOperation(value = "更新用户组")
     public AjaxMessage<Integer> update(@ApiParam(value = "设置配置", required = true) @RequestBody UserGroup userGroup) {
         int result = userGroupService.update(userGroup);
         if(result==-1){
@@ -115,8 +115,8 @@ public class UserGroupController {
         return new AjaxMessage<>(ResultStatus.OK);
     }
     @RequestMapping(value = "deleteAll", method = RequestMethod.POST)
-    @ApiOperation(value = "查询角色对应user")
-    AjaxMessage<Integer> deleteAll(@ApiParam(value = "角色id", required = true)@RequestBody List<Integer> ids){
+    @ApiOperation(value = "删除用户组")
+    AjaxMessage<List<String>> deleteAll(@ApiParam(value = "用户组id", required = true)@RequestBody List<Integer> ids){
 
         return new AjaxMessage<>(ResultStatus.OK,
                 userGroupService.deleteAll(ids));

user_center/src/main/java/com/huaxu/dto/RoleDto.java

@@ -8,7 +8,7 @@ public class RoleDto {
     @ApiModelProperty(value = "主键")
     private Integer id ;
     @ApiModelProperty(value = "名称")
-    private String name;
+    private String roleName;
     @ApiModelProperty(value = "用户数目")
     private Integer users;
     @ApiModelProperty(value = "状态",notes = "0:开启，1禁用")

user_center/src/main/java/com/huaxu/service/OrgService.java

@@ -76,7 +76,7 @@ public interface OrgService {
      * @param id 主键
      * @return 影响行数
      */
-    int deleteAll(List<Integer>ids);
+    List<String> deleteAll(List<Integer>ids);
 
     /**
      * 查询总数据数

user_center/src/main/java/com/huaxu/service/RoleService.java

@@ -71,7 +71,7 @@ public interface RoleService {
      * @return 影响行数
      */
     int deleteById(Integer id);
-    int deleteAll(List<Integer>ids);
+    List<String> deleteAll(List<Integer>ids);
 
     /**
      * 查询总数据数

user_center/src/main/java/com/huaxu/service/UserGroupService.java

@@ -70,7 +70,7 @@ public interface UserGroupService {
      * @return 影响行数
      */
     int deleteById(Integer id);
-    int deleteAll(List<Integer>ids);
+    List<String> deleteAll(List<Integer>ids);
     /**
      * 查询总数据数
      *

user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -3,7 +3,6 @@ package com.huaxu.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dao.OrgMapper;
 import com.huaxu.dto.OrgTree;
-import com.huaxu.dto.RoleRequestDto;
 import com.huaxu.entity.Org;
 import com.huaxu.model.LoginUser;
 import com.huaxu.service.OrgService;
@@ -12,10 +11,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -128,7 +124,8 @@ public class OrgServiceImpl implements OrgService {
     }
 
     @Override
-    public int deleteAll(List<Integer> ids) {
+    public List<String> deleteAll(List<Integer> ids) {
+         List<String>fail=new ArrayList<>();
             ids.forEach(id->{
                         Org org=new Org();
                         org.setId(id);
@@ -136,13 +133,15 @@ public class OrgServiceImpl implements OrgService {
                         if(orgUser==null){
                             org.setStatus(-1);
                             orgMapper.update(org);
+                        }else {
+                            fail.add(orgUser.getOrgName());
                         }
 
                  });
 
 
 
-        return 0;
+        return fail;
     }
 
     /**

user_center/src/main/java/com/huaxu/service/impl/RoleServiceImpl.java

@@ -1,7 +1,6 @@
 package com.huaxu.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.huaxu.dao.RoleMapper;
 import com.huaxu.dao.RoleMenuMapper;
 import com.huaxu.dao.RoleOrgMapper;
@@ -156,7 +155,8 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public int deleteAll(List<Integer> ids) {
+    public List<String> deleteAll(List<Integer> ids) {
+        List<String>fail=new ArrayList<>();
         ids.forEach(id->{
             Role role=new Role();
             role.setId(id);
@@ -164,6 +164,8 @@ public class RoleServiceImpl implements RoleService {
                 if (roleUser==null){
                     role.setStatus(-1);
                     roleMapper.update(role);
+                }else {
+                    fail.add(roleUser.getRoleName());
                 }
                 //删除用户与角色的关系
                 //roleMapper.deleteRoleUser(role);
@@ -172,7 +174,7 @@ public class RoleServiceImpl implements RoleService {
 
         });
 
-        return 0;
+        return fail;
     }
 
     /**

user_center/src/main/java/com/huaxu/service/impl/UserGroupServiceImpl.java

@@ -3,7 +3,6 @@ package com.huaxu.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dao.GroupUserMapper;
 import com.huaxu.dao.UserGroupMapper;
-import com.huaxu.dao.UserRoleMapper;
 import com.huaxu.dto.UserGroupDto;
 import com.huaxu.entity.*;
 import com.huaxu.model.LoginUser;
@@ -118,7 +117,8 @@ public class UserGroupServiceImpl implements UserGroupService {
     }
 
     @Override
-    public int deleteAll(List<Integer> ids) {
+    public List<String> deleteAll(List<Integer> ids) {
+        List<String>fail=new ArrayList<>();
         ids.forEach(id->{
             UserGroup userGroup=new UserGroup();
             userGroup.setId(id);
@@ -129,10 +129,12 @@ public class UserGroupServiceImpl implements UserGroupService {
                 userGroupMapper.update(userGroup);
                 //删除用户与用户组的关系
                 // userGroupMapper.deleteUserGroupRelations(userGroup);
-            }
+            }else {
+                    fail.add(hasUserGroupUsers.getGroupName());
+                }
         });
 
-        return 0;
+        return fail;
     }
 
     /**
@@ -154,6 +156,7 @@ public class UserGroupServiceImpl implements UserGroupService {
     public IPage<UserGroup> selectPage(UserGroup userGroup, IPage<UserGroup> page) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         userGroup.setTenantId(currentUser.getTenantId());
+
         return this.userGroupMapper.selectPage(page, userGroup);
     }
 

user_center/src/main/resources/mapper/OrgMapper.xml

@@ -199,6 +199,7 @@
         <include refid="Base_Column_List"/>
         from uims_org
         <where>
+            status!=-1
             <if test="org.id != null">
                 and ID = #{org.id}
             </if>
@@ -253,7 +254,7 @@
         </where>
     </select>
     <select id="findOrgUser" resultType="com.huaxu.entity.Org">
-        select a.ID from uims_org a join uims_user b on
+        select a.ID,a.ORG_NAME orgName from uims_org a join uims_user b on
          (a.ID=b.DEPT_ORG_ID or a.ID=b.COMPANY_ORG_ID)
          where a.id=#{id} and b.status!=-1
          limit 1
@@ -262,6 +263,7 @@
           select ID, TENANT_ID, PARENT_ORG_ID,ORG_NAME
            from uims_org
            <where>
+               status!=-1
                <if test="tenantId!=null ">
                    TENANT_ID=#{tenantId}
                </if>

user_center/src/main/resources/mapper/RoleMapper.xml

@@ -19,7 +19,7 @@
     <resultMap type="com.huaxu.dto.RoleDto" id="RoleDtoMap">
         <result property="id" column="ID" jdbcType="INTEGER"/>
 
-        <result property="name" column="ROLE_NAME" jdbcType="VARCHAR"/>
+        <result property="roleName" column="ROLE_NAME" jdbcType="VARCHAR"/>
 
         <result property="users" column="cn" jdbcType="INTEGER"/>
         <result property="roleState" column="ROLE_STATE" jdbcType="INTEGER"/>
@@ -169,6 +169,7 @@
         where a.TENANT_ID=#{role.tenantId} group by b.ROLE_ID) b
         ON a.id=b.ROLE_ID
         <where>
+            and status!=-1
             <if test="role.id != null">
                 and ID = #{role.id}
             </if>
@@ -208,7 +209,8 @@
         </where>
     </select>
     <select id="findRoleUser" resultType="com.huaxu.entity.Role">
-        select a.id from uims_user_role a where a.ROLE_ID=#{id} and a.status!=-1 limit 1
+        select a.id,b.ROLE_NAME  from uims_user_role a join uims_role b on a.ROLE_ID=b.ID
+         where a.ROLE_ID=#{id} and a.status!=-1 limit 1
     </select>
     <sql id="sysAreaJoins">
           left join uims_org com ON com.id = a.company_org_id

user_center/src/main/resources/mapper/UserGroupMapper.xml

@@ -149,6 +149,7 @@
         <include refid="Base_Column_List"/>
         from uims_user_group
         <where>
+             STATUS!=-1
             <if test="userGroup.id != null">
                 and ID = #{userGroup.id}
             </if>
@@ -185,8 +186,8 @@
         </where>
     </select>
     <select id="findHasUserGroupUsers" resultType="com.huaxu.entity.UserGroup">
-        select  id from uims_group_user
-        where GROUP_ID=#{id} and status!=-1 limit 1
+        select  a.id,b.GROUP_NAME groupName from uims_group_user a join uims_user_group b on a.GROUP_ID=b.ID
+        where a.GROUP_ID=#{id} and a.status!=-1 limit 1
     </select>
     <sql id="userColumns">
          a.id as "id" ,