Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/dao/TenantMapper.java

@@ -73,6 +73,8 @@ public interface TenantMapper  {
      */
     int deleteById(Integer id);
 
+    int deleteUserByTenantId(Integer id);
+
     /**
      * 查询总数据数
      *

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

@@ -123,7 +123,6 @@ public class TenantServiceImpl implements TenantService {
         role.setDescription(tenantDto.getTenantName() +"初始化角色");
         role.setRoleState(1);
         role.setPermissionType(1);
-        role.setStatus(1);
         roleRequestDto.setRole(role);
         //查询租户菜单id
 //        List<Integer > tenantMenuIds = tenantMapper.selectTenantMenuIds(tenantDto.getId());
@@ -135,11 +134,11 @@ public class TenantServiceImpl implements TenantService {
 
         /*创建机构*/
         Org org = new Org();
+        org.setTenantId(tenantDto.getCode());
         org.setOrgLeaderName(tenantDto.getUserName());
         org.setOrgLeaderPhone(tenantDto.getPhone());
         org.setOrgName(tenantDto.getTenantName());
         org.setOrgState(1);
-        org.setStatus(1);
         org.setOrgType("company");  //机构类型
         org.setParentId(0);
         orgService.insert(org);
@@ -208,8 +207,10 @@ public class TenantServiceImpl implements TenantService {
         userEntity.setDateUpdate(new Date());
         userEntity.setPhone(tenantDto.getPhone());
         userEntity.setUsername(tenantDto.getUserName());
+        userEntity.setEnableState("1");
         userService.updateUserById(userEntity);
 
+
         //创建角色
         RoleRequestDto roleRequestDto = new RoleRequestDto();
         Role role = roleService.selectById(userEntity.getRoleId().intValue());
@@ -238,6 +239,8 @@ public class TenantServiceImpl implements TenantService {
     public int deleteById(Integer id) {
         //先删除租户菜单
         tenantMapper.deleteTenantMenuIds(id,null);
+        //删除用户信息
+        tenantMapper.deleteUserByTenantId(id);
         return tenantMapper.deleteById(id);
     }
 

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

@@ -17,7 +17,7 @@
     </sql>
 
     <sql id="tenantJoins">
-        left join uims_user u on t.code=u.TENANT_ID and u.USER_TYPE='1'
+        left join uims_user u on t.code=u.TENANT_ID and u.USER_TYPE='1' and u.status =1
         left join (
 			select d.DICT_CODE,d.DICT_VALUE
 			from uims_dict p
@@ -122,15 +122,19 @@
         update  uims_tenant set status = 0 where ID = #{id}
     </delete>
 
+    <delete id="deleteUserByTenantId">
+        update uims_user u
+        left join uims_tenant t on u.TENANT_ID=t.code
+        set u.status = 1
+        where t.id=#{id}
+    </delete>
     <!-- 总数 -->
     <select id="count" resultType="int">
-        select count(*) from uims_tenant
+        select count(*) from uims_tenant and status =1
     </select>
     <select id="countIds" resultType="java.lang.Integer">
         select id from uims_tenant
-        <where>
-            TENANT_NAME =#{tenantName}
-        </where>
+        where TENANT_NAME =#{tenantName} and status =1
     </select>
 
     <!-- 分页查询 -->
@@ -172,7 +176,7 @@
     </insert>
     <!-- 通过租户id查询租户菜单id -->
     <select id="selectTenantMenuIds" resultType="java.lang.Integer">
-        select MENU_ID from uims_tenant_menu where TENANT_ID = #{tenantId}
+        select MENU_ID from uims_tenant_menu where TENANT_ID = #{tenantId} and status =1
     </select>
 
     <delete id="deleteTenantMenuIds">