Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/UserMapper.java

@@ -22,4 +22,6 @@ public interface UserMapper extends BaseMapper<User> {
     UserVO getUserByAccount(@Param("userVO") UserVO userVO);
 
     List<UserVO> selectUserListByCondition(@Param("roleType") Integer roleType, @Param("companyId")Integer companyId,@Param("flag") Integer flag, @Param("keyName") String keyName,@Param("list")List<Integer> uIds,@Param("user")User user);
+
+    List<UserVO> selsctUsersByUids(@Param("list")List<Integer> uids, @Param("id")Integer id);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -522,7 +522,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).ne("parent_id",1)).stream().map(User::getId).collect(Collectors.toList());
             uids.addAll(userIds);
             uids.add(-1);
-            qw.in("id",uids).ne("id",id);
         }else{
             //项目经理
             if(null != projectId){
@@ -532,10 +531,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).ne("parent_id",1)).stream().map(User::getId).collect(Collectors.toList());
                 uids.addAll(userIds);
                 uids.add(-1);
-                qw.in("id",uids).ne("id",user.getId());
+                id = user.getId();//不能是管理员本人
             }
         }
-        msg.data = userMapper.selectList(qw);
+        List<UserVO> userVOS = userMapper.selsctUsersByUids(uids,id);
+        msg.data = userVOS;
         return msg;
     }
 

cloud-model/src/main/resources/mapper/UserMapper.xml

@@ -48,6 +48,23 @@
         id, account, username, password, mobile, role_type, company_id, parent_id, sex, role_name, work_state, is_disable, indate, head_imgurl, team_name, subordinate_type, openid
     </sql>
 
+    <select id="selsctUsersByUids" resultMap="BaseResultMapVO">
+      SELECT
+        u.id id,  u.username username,  u.mobile mobile,  u.company_id company_id, c.`company_name` company_name,
+        u.parent_id parent_id,  u.work_state work_state, u.is_disable is_disable,
+        u.indate indate, u.head_imgurl head_imgurl, u.team_name team_name, u.subordinate_type subordinate_type
+        FROM
+        tb_user AS u
+        LEFT JOIN tb_company c
+        ON u.company_id = c.`id`
+      <where>
+        <foreach collection="list" separator="," close=")" item="item" open="u.id in (" index="index">
+          #{item}
+        </foreach>
+          and u.id != #{id}
+      </where>
+    </select>
+
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         SELECT
         u.id id, u.account account, u.username username, u.password password, u.mobile mobile, u.role_type role_type, u.company_id company_id, c.`company_name` company_name,