From dbf6227c77a475f01b8e1912c1736a37512f99cb Mon Sep 17 00:00:00 2001 From: songwenxuan <1924103812@qq.com> Date: Tue, 25 Jun 2024 17:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=20Bug=20=E7=9C=8B?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E4=B8=8E=E8=87=AA=E5=B7=B1=E6=9C=89=E5=85=B3?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8F=91=E8=B5=B7=E5=AE=89=E5=85=A8=E7=8E=AF?= =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E3=80=82=2016445=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E4=BA=86=20Bug=20=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E7=8A=B6=E6=80=81=E3=80=82=2016444=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E4=BA=86=20Bug=20=E6=91=84=E5=83=8F=E5=A4=B4=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=9C=AA=E6=98=BE=E7=A4=BA=2016443=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E4=BA=86=20Bug=20=E9=9B=86=E5=9B=A2=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E3=80=82=2016441=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=20Bug=20=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E6=9C=AA=E5=81=9A=E6=A0=A1=E9=AA=8C=2016439=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=20Bug=20=E9=80=89=E6=8B=A9=E6=91=84?= =?UTF-8?q?=E5=83=8F=E5=A4=B4=E7=9A=84=E6=97=B6=E5=80=99=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=EF=BC=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=9B=9E=E5=88=B0=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=BA=86=E3=80=82?= =?UTF-8?q?=20=E5=BA=94=E4=BF=9D=E5=AD=98=E5=9C=A8=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=2016442?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keyProjects/PersonnelManagementController.java | 2 +- .../com/zcloud/controller/map/MapKeyProjectController.java | 1 + .../resources/mybatis/datasource/bus/CorpPromiseMapper.xml | 6 +++++- .../mybatis/dsno2/keyProjects/OutSourcedMapper.xml | 1 + .../mybatis/dsno2/keyProjects/VideoManagerMapper.xml | 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) 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 @@