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/controller/InvitationRecordController.java

@@ -38,7 +38,7 @@ public class InvitationRecordController {
     @ResponseBody
     public HttpRespMsg inviteUser(InvitationRecord invitationRecord,String token) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = invitationRecordService.add(invitationRecord);
+        msg = invitationRecordService.add(invitationRecord,token);
         return msg;
     }
 

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

@@ -20,4 +20,6 @@ public interface UserMapper extends BaseMapper<User> {
     List<UserVO> selectListByCondition(@Param("roleType") Integer roleType, @Param("companyId")Integer companyId,@Param("flag") Integer flag, @Param("user") User user, @Param("keyName") String keyName);
 
     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);
 }

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

@@ -2,7 +2,6 @@ package com.hssx.cloudmodel.service;
 
 import com.hssx.cloudmodel.entity.InvitationRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 
 /**
@@ -14,6 +13,5 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
  * @since 2019-08-20
  */
 public interface InvitationRecordService extends IService<InvitationRecord> {
-
-    HttpRespMsg add(InvitationRecord invitationRecord);
+    HttpRespMsg add(InvitationRecord invitationRecord,String token);
 }

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

@@ -24,7 +24,7 @@ public class InvitationRecordServiceImpl extends ServiceImpl<InvitationRecordMap
     @Resource
     InvitationRecordMapper invitationRecordMapper;
     @Override
-    public HttpRespMsg add(InvitationRecord invitationRecord) {
+    public HttpRespMsg add(InvitationRecord invitationRecord,String token) {
         HttpRespMsg msg = new HttpRespMsg();
 
         return null;

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

@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @author 吴涛涛
@@ -72,7 +73,33 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public HttpRespMsg pageList(PageUtil page, Integer companyId, Integer flag, String keyName, User user, Integer roleType) {
         HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
-        List<UserVO> users = userMapper.selectListByCondition(roleType, companyId, flag, user, keyName);
+        List<UserVO> users = new ArrayList<>();
+        List<Integer>  uIds = new ArrayList<>();
+        if(Constant.SYS_PARENT_ID == user.getParentId()){
+            users = userMapper.selectListByCondition(roleType, companyId, flag, user, keyName);
+        } else if (Constant.SYS_ID == user.getParentId()) {
+            QueryWrapper<Project> qwr = new QueryWrapper<>();
+            //资产方管理员,看到自己创建的项目下的所有人
+            qwr.select("id").eq("creator_id", user.getId());
+            uIds = projectMapper.selectList(qwr).stream().map(Project::getManagerId).collect(Collectors.toList());
+            List<Integer> projectIds = projectMapper.selectList(qwr).stream().map(Project::getId).collect(Collectors.toList());
+            projectIds.add(-1);
+            List<Integer> projectUserIds = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().in("project_id", projectIds)).stream().map(ProjectUser::getUserId).collect(Collectors.toList());
+            uIds.addAll(projectUserIds);
+            List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", projectIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
+            uIds.addAll(projectApproveIds);
+            uIds.add(-1);
+            users = userMapper.selectUserListByCondition(roleType, companyId, flag,keyName,uIds);
+        } else {
+            List<Integer> pIds = projectMapper.selectList(new QueryWrapper<Project>().eq("manager_id", user.getId())).stream().map(Project::getId).collect(Collectors.toList());
+            pIds.add(-1);
+            List<Integer> projectUserIds = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().in("project_id", pIds)).stream().map(ProjectUser::getUserId).collect(Collectors.toList());
+            uIds.addAll(projectUserIds);
+            List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", pIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
+            uIds.addAll(projectApproveIds);
+            uIds.add(-1);
+            users = userMapper.selectUserListByCondition(roleType, companyId, flag,keyName,uIds);
+        }
         List<Project> projects = new ArrayList<>();
         for (UserVO userVO : users) {
             List<Integer> set = new ArrayList<>();

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

@@ -133,8 +133,6 @@
         <result column="rfid" property="rfid" />
         <result column="setting_life" property="settingLife" />
         <result column="area" property="area" />
-        <result column="factory_id" property="factoryId" />
-        <result column="factory_name" property="factoryName" />
         <result column="initial_modulus" property="initialModulus" />
         <result column="equipment_id" property="equipmentId" />
         <result column="belong_project_grade" property="belongProjectGrade" />
@@ -143,7 +141,7 @@
     </resultMap>
     <select id="selectMouldsList" resultMap="BaseResultMouldMap">
     select
-      id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, factory_id, factory_name,
+      id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area,
       initial_modulus, equipment_id, belong_project_grade, produce_company_id, run_times
     from
       tb_mould

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

@@ -74,6 +74,32 @@
         </where>
         Order by u.id desc
     </select>
+    <select id="selectUserListByCondition" 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,
+        u.role_name role_name,u.parent_id parent_id, u.sex sex, 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>
+            u.id in
+            <foreach collection="list" index="index" open="(" item="item" close=")" separator=",">
+              #{item}
+        </foreach>
+            <if test="flag==0 and keyName != '' and keyName !=null">
+                AND u.username like concat('%',#{keyName},'%')
+            </if>
+            <if test="flag==1 and keyName != '' and keyName !=null">
+                AND u.account like concat('%',#{keyName},'%')
+            </if>
+            <if test="companyId != -1">
+                AND  u.company_id = #{companyId}
+            </if>
+        </where>
+        Order by u.id desc
+    </select>
     <select id="getUserByAccount" 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,