解决了 Bug 看不到与自己有关的重点工程项目无法发起安全环保检查。 16445

解决了 Bug 未显示在线状态。 16444
解决了 Bug 摄像头数量未显示 16443
解决了 Bug 集团单位没有数据。 16441
解决了 Bug 身份证号未做校验 16439
解决了 Bug 选择摄像头的时候点击取消按钮，直接回到主页面了。 应保存在当前页面 16442

src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java

@@ -48,7 +48,7 @@ public class PersonnelManagementController extends BaseController {
         String errInfo = "success";
         PageData pd = this.getPageData();
         Map result = HttpClientService.doPost(tongBuUrl + "/api/personnelmanagement/findByName", pd);
-        if (result.get("pd")==null){
+        if (result == null || result.get("pd")==null){
             pd.put("PERSONNELMANAGEMENT_ID", this.get32UUID());    //主键
             pd.put("CREATOR", Jurisdiction.getUSER_ID());    //添加人
             pd.put("CREATTIME", DateUtil.date2Str(new Date()));    //添加时间

src/main/java/com/zcloud/controller/map/MapKeyProjectController.java

@@ -76,6 +76,7 @@ public class MapKeyProjectController extends BaseController {
         PageData pd = new PageData();
         pd = this.getPageData();
         pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
+        pd.put("UserId", Jurisdiction.getUSER_ID()); // 企业
         page.setPd(pd);
         List<PageData> varList = outsourcedService.list(page);    //列出OutSourced列表
         map.put("varList", varList);

src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml

@@ -108,6 +108,8 @@
 		left join OA_DEPARTMENT dept on dept.DEPARTMENT_ID = people.DEPARTMENT_ID
 		left join SYS_POST post on post.POST_ID = people.POST_ID
 		left join sys_user creUser on creUser.USER_ID = f.CREATOR
+		LEFT JOIN BUS_CORPPROMISE_PEOPLE pid ON pid.PROMISE_ID = t.PROMISE_ID and pid.ISPROMISE_PEOPLE = '0'
+		LEFT JOIN BUS_CORPPROMISE_PEOPLE ped ON ped.PROMISE_ID = t.PROMISE_ID and ped.ISPROMISE_PEOPLE = '1'
 		where 1=1 and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.ISDELETE = 0
 		<if test="pd.roleLevel != null and pd.roleLevel != ''"><!-- 权限显示 -->
 			<choose>
@@ -117,7 +119,9 @@
 					and creUser.DEPARTMENT_ID  in (${pd.supDeparIds})
 				</when>
 				<when test='pd.roleLevel == "2"'>
-					and creUser.USER_ID = #{pd.loginUserId}
+					and (creUser.USER_ID = #{pd.loginUserId}
+						or pid.USER_ID = #{pd.loginUserId}
+						or ped.USER_ID = #{pd.loginUserId} )
 				</when>
 			</choose>
 		</if>

src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml

@@ -831,6 +831,7 @@
 		pci.NAME Q_COMPETENT_DEPT_NAME,
 		(select count(1) from `qa-cmt-regulatory`.BUS_AIWARNING a left join bus_videomanager avid on avid.VIDEOMANAGER_ID = a.VIDEOMANAGER_ID where  avid.OUTSOURCED_ID= f.OUTSOURCED_ID and a.ISDELETE = '0') as AI_COUNT,
 		(select count(1) from `qa-cmt-regulatory`.BUS_VIDEOMANAGER v where v.OUTSOURCED_ID = f.OUTSOURCED_ID and v.ISDELETE = '0') as VIDEO_COUNT,
+		(SELECT count( 1 ) FROM `qa-cmt-regulatory`.BUS_VIDEOMANAGER v LEFT JOIN bus_video_resources vr ON vr.VIDEO_RESOURCES_ID = v.VIDEO_RESOURCES_ID WHERE v.OUTSOURCED_ID = f.OUTSOURCED_ID AND v.ISDELETE = '0' AND vr.VIDEO_RESOURCES_ID is not null ) AS VIDEO_ONLINE_COUNT,
 		(SELECT count( 1 ) FROM `qa-cmt-prevention`.BUS_KEYPROJECTPUNISH k left join `qa-cmt-prevention`.bus_keyprojectcheck kjc on kjc.KEYPROJECTCHECK_ID = k.KEYPROJECTCHECK_ID WHERE  kjc.OUTSOURCED_ID =f.OUTSOURCED_ID   AND k.ISDELETE = '0' ) as KEY_COUNT,
 		vua.NAME OUTSOURCED_CREATOR_NAME,
 		ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,

src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml

@@ -298,9 +298,10 @@
 	<!-- 列表 -->
 	<select id="dataApplistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,CASE WHEN vr.ONLINE_STATUS = '0' THEN	'在线' ELSE '离线' END ONLINE_STATUS
 		from
 		<include refid="tableName"></include> f
+		LEFT JOIN BUS_VIDEO_RESOURCES vr on vr.VIDEO_RESOURCES_ID = f.VIDEO_RESOURCES_ID
 		where f.ISDELETE = '0'
 		<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''"><!-- 关键词检索 -->
 			and f.OUTSOURCED_ID=#{pd.OUTSOURCED_ID}