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/MouldMapper.java

@@ -28,4 +28,6 @@ public interface MouldMapper extends BaseMapper<Mould> {
     MouldVO getDetailById(@Param("mouldVO")MouldVO mouldVO);
 
     List<MouldVO> maintainMouldList(UserVO userVO);
+
+    List<MouldVO> selectListByCompanyId(@Param("companyId")Integer companyId);
 }

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

@@ -362,19 +362,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     public HttpRespMsg getModelListByCompanyId(User user) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<Mould> qw = new QueryWrapper<>();
+        Integer companyId = -1;
         if (Constant.SYS_ID == user.getParentId()) {
             //此时是admin
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getId()));
-            qw.eq("company_id", admin.getCompanyId());
+            companyId = admin.getCompanyId();
+//            qw.eq("company_id", admin.getCompanyId());
         } else if (Constant.SYS_PARENT_ID == user.getParentId()) {
             //系统管理员
 //            qw.eq("company_type",Constant.ASSETS_COMPANY);
         } else {
             //此时是项目经理
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getParentId()));
-            qw.eq("company_id", admin.getCompanyId());
+            companyId = admin.getCompanyId();
+//            qw.eq("company_id", admin.getCompanyId());
         }
-        msg.data = mouldMapper.selectList(qw);
+        msg.data = mouldMapper.selectListByCompanyId(companyId);
         return msg;
     }
 

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

@@ -178,4 +178,27 @@
         where
         tbm.id = #{mouldVO.id}
     </select>
+
+    <select id="selectListByCompanyId" resultMap="BaseResultMapVO">
+select
+        tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbm.creator_id creator_id,tbm.equipment_id equipment_id,tbm.is_maintain,tbm.holes,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.pre_update_id,
+        tbp.manager mangerName,tbm.area area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
+        tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times
+        from
+        tb_mould tbm
+        left join
+        tb_mould_equipment tbmp
+        on
+        tbm.equipment_id = tbmp.id
+        left join
+        tb_project tbp
+        on tbp.id = tbm.project_id
+        left join
+        tb_company tbc
+        on
+        tbc.id = tbm.company_id
+        where
+          tbm.company_id = #{companyId}
+    </select>
 </mapper>