Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

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

@@ -182,6 +182,7 @@ public class OrgServiceImpl implements OrgService {
                 orgIds.add(programItem.getOrgId());
             });
         }
+
         List<OrgTree> trees=orgMapper.selectTrees(org);
 
         trees=getOrgTree(trees,0,1,orgIds);
@@ -198,7 +199,7 @@ public class OrgServiceImpl implements OrgService {
 
                 if (id.equals(orgTree.getParentOrgId())) {
                     //拥有权限可以显示
-                    if(set.contains(id)){
+                    if(!set.contains(id)){
                         orgTree.setDisplay(true);
                     }
                     List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++level,set);

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

@@ -184,6 +184,7 @@ public class UserGroupServiceImpl implements UserGroupService {
             user.setStatus(1);
             userRoleEntities.add(userRoleEntity);
         });
+
         userGroupMapper.deleteUserRoles(userGroupDto);
         userGroupMapper.batchInsertRoles(userRoleEntities);
         groupUserMapper.batchInsert(groupUsers);

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

@@ -220,14 +220,14 @@
          from uims_user a left join uims_group_user b on a.id=b.USER_ID
         <include refid="sysAreaJoins"/>
         where  a.status!=0
-        <if test="id != 0 ">
+        <if test="id != -1 ">
            and  b.GROUP_ID=#{id} and b.status!=0 and userrole.status!=0
         </if>
         <if test="id == 0 ">
           and  b.GROUP_ID is null
         </if>
         <if test="tenantId != null and tenantId != ''">
-            and TENANT_ID = #{tenantId}
+            and a.TENANT_ID = #{tenantId}
         </if>
     </select>
     <update id="deleteUserGroupRelations">