diff --git a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java b/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java index 40c74237..77afa868 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/PersonnelManagementController.java +++ b/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())); //添加时间 diff --git a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java index a766916a..1c5603be 100644 --- a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java +++ b/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 varList = outsourcedService.list(page); //列出OutSourced列表 map.put("varList", varList); diff --git a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml b/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml index f4802cd6..057a9189 100644 --- a/src/main/resources/mybatis/datasource/bus/CorpPromiseMapper.xml +++ b/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 @@ -117,7 +119,9 @@ and creUser.DEPARTMENT_ID in (${pd.supDeparIds}) - and creUser.USER_ID = #{pd.loginUserId} + and (creUser.USER_ID = #{pd.loginUserId} + or pid.USER_ID = #{pd.loginUserId} + or ped.USER_ID = #{pd.loginUserId} ) diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index d94ac13b..3427538b 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/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, diff --git a/src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml index 7a2afb83..eec3019e 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/VideoManagerMapper.xml @@ -298,9 +298,10 @@