From ba11a47341ba2ac4532e57565c71bdaa01c98739 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 15:34:19 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/sys/service/OrgEOService.java | 2 +- .../da/sys/controller/UserEOController.class | Bin 13041 -> 13041 bytes .../da/sys/service/UserEOServiceImpl.class | Bin 18719 -> 18719 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java index 407756f..e959ff9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; -import java.util.UUID; @Service("orgEOService") @Transactional @@ -71,6 +70,7 @@ public class OrgEOService extends ServiceImpl implements IOrgEo orgEO.setId(orgEO.getOrgCode()); baseMapper.insert(orgEO); }else{ + orgEO.setId(orgEO.getOrgCode()); baseMapper.updateById(orgEO); } return Result.success(); diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index ab709c7d84a30fdc8067bb69ceb0a84119b724ec..90e30587035e71432895995142276be4758f39aa 100644 GIT binary patch delta 355 zcmWO2ODIHP7{>Ac5sN`mI!RF^jmyMDHp)ub+Dx&Klq@WW#-)aFUy&HcMr_a^*U_1A zNh!ITCb@;3TlTZEvG8o)-_!R#?-y^4w}zgaNnXQ4xBccc4Tq0(`pIM5`Ynt)CP-zH zOy;a;(NfX^$t>Dk#e>Gs3JC;-t7Nc70qeL3@1*dd5BSszU*z(w vtA6aovTVbgqFB{Ds#ebo4FqV!vSaQAcCk}(8G)Yk;*(N4(QBKO$MRAan=HNgiOO~1JN}0xIEoCXm(lq)^ zc5NSKz0T0CjBBs7#YG zEy}bi)2>V(7H)PJAjr7fE1#54$>-%Ony<3Unru_%mjx1pLE#CB8?E4T$4{&oo=Y&mIm(B;elqJXycU*p6TR;9^TAg!M**RI6m}%Pi^=joo`+B uV=WY>8g?Ifm|8MJwW`%HO)axl*colu`$dDI5z&xnSTt&eo!w@Ak?$XDZ)p$! diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class index 18fe9e5a62030cd1ca506760c5c0e2f1e6acdfa8..f005a645a72077abd891cade689900cbf62af94a 100644 GIT binary patch delta 873 zcmWNPdrX#P7{-6s`$il*z$c2Rsh=_|($A2CfG371p)@p-j56aOIz&MfQS+NH%}6Fr zc@j}@sHsyoTkGqz75%}cEoW+5%TZJ3)PLOC+RU7PSl)ZLXYYR3c0bp3KUaU3`n&W+ zVS4K_;#kgT-ee+Wr12JctY8V{_PtFNtJuK%G_#uBRN{>EQO!AO_=+|BN-cL;%R|=j zm^%Jrz2c}>5{;Thi_+PyCG1ccAL>1Js+zDGj5V{1D?nLfFuhHob^?6D81|Wo{iM=K zItQ4`Ar{eP_MF)`Vn+H2bH+7hd>wV3VO(%&nH^EzFp_WGcbPR&KNuTu!K^9`x_`13 zxyxB0{bYaLfvd#w3yEB_`PT_?Bhs6lpw!=q=BA+`Lw}INpA>S7H@Hm&cP!aW>bd7` z%)X?*TzAf<5s&SHe~IUb*?sB~a|g!rKT(30BvRxtLq0irfnqIm4|4}qQbx2_;s0UO!LcEYk$bG}ZD(=PP--awDhqehQeU3&@A=PHWxomX5G*knqRDVt5% KVoI|qm!AW4(8R_7 delta 873 zcmWNPX>8P06vcn%|98>_p&bfkk!4^~p~7J4LKlT9!%~nmP%TZBtu19~3l!Rd;E<^( zDb^IE4;q#ti_m~ZV;l)2rhLFalmJ3vBB())@P!Y=L=a;F@#ZBj@1B#~d(M65Xt$1b z>&s|Pd?BeUVh9zC=5?}pgJLR~$6~vys9`BhETfg>?6AsFOD}btW+h)!&rMeG2dlZy z8XnQWQyP^@lQL=6^K4NLTQ!eus^A^HMNGA9*LuTRiE{<0NLHgX~RSi%7la*P;#ZbR&yF+})y) zyY9xcOM2jX3Y!Q1V*?(O#=j=_KbKL|KT;5o7$uLed?xD|3KgJCQFp)SqUO5Ki`Qv^ zd#IQQp&ZQDy?9JYFKNVYEvCMw36eh=L@ak z8?EMo8n~)PZmWsATBjs!&|o#IK$|pEEvi?WHrshmTlA6M))8%0pSJ0H#q^`L>)w3D z^_SZ9MDKbbz3)xZPOn@YUbS|4F?D)f`q1lFmv=?Gz1!O3r)aOAseOJ}`~6(?__aFd zZ&rgJ)5nRirD1P&5~)gNm{JJY&u41@#TsdzMwzFu`I$hCCbC}HmWCH-*Cd>#)2kWu zsg$quig}uu=y>&xrcWkC5i&J}@p_S53r~@z5>>9X$Rnys|mLjmB&; Nrp1_6W7>?l{6D6H#Et*} From 4063bb9fda830cf2f1ecdb0bd2b13657ef268530 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 15:51:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=E9=A2=84=E8=A7=88=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=ADEmployeeT?= =?UTF-8?q?ypeID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/constant/PowerApplyConstants.java | 5 +++++ .../report/service/impl/IReportServiceImpl.java | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java index b3d3aeb..70f24be 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java +++ b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java @@ -51,4 +51,9 @@ public class PowerApplyConstants { * 有预览和下载全部报告权限的levelId */ public static final Double SPECIAL_LEVEL_FOUL = 4.0; + + /** + * 有预览和下载全部报告权限的Employee_TYPE_ID + */ + public static final Double EMPLOYEE_TYPE_ID_ONE = 1.0; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 22b6f55..e54a37a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -458,11 +458,14 @@ public class IReportServiceImpl extends ServiceImpl //设置权限 UserEO userEo = userEODao.selectById(UserUtils.getUserId()); String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); + String employeeTypeId = userEo.getEmployeeTypeId() == null ? "0.8" : userEo.getEmployeeTypeId(); //用户级别 double level = Double.parseDouble(levelId); + double employeeType = Double.parseDouble(employeeTypeId); //总监拥有全部报告的预览和下载权力 if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || - level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL) { + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || + employeeType == EMPLOYEE_TYPE_ID_ONE) { list.getRecords().forEach(reportVo -> { reportVo.setPower(PREVIEW_DOWNLOAD); }); @@ -632,9 +635,15 @@ public class IReportServiceImpl extends ServiceImpl //校验权限 //总监(levelId) UserEO userEo = userEODao.selectById(userId); - Double levelId = Double.parseDouble(userEo.getLevelId() == null ? "1.0" : userEo.getLevelId()); - if (levelId.equals(SPECIAL_LEVEL_ONE) || levelId.equals(SPECIAL_LEVEL_TWO) || - levelId.equals(SPECIAL_LEVEL_THREE) || levelId.equals(SPECIAL_LEVEL_FOUL)) { + String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); + String employeeTypeId = userEo.getEmployeeTypeId() == null ? "0.8" : userEo.getEmployeeTypeId(); + //用户级别 + double level = Double.parseDouble(levelId); + double employeeType = Double.parseDouble(employeeTypeId); + //总监拥有全部报告的预览和下载权力 + if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || + employeeType == EMPLOYEE_TYPE_ID_ONE) { return true; } //本人 From f59b25a85cc54c13159adfb6f8bbf5a000091ee6 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 16:05:37 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D[=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8A=A5=E9=94=99]Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 编辑报告-部门为空的时候，编辑按钮报错 --- .../da/report/service/impl/IReportServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index e54a37a..3f4bf17 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -689,11 +689,13 @@ public class IReportServiceImpl extends ServiceImpl ReportDetailVo reportDetailVo = reportDao.reportDetail(reportId); //设置部门名称 String department = reportDetailVo.getDepartment(); - String[] idArray = department.split(","); - List orgEOList = orgEOService.query().in("ID", idArray).list(); - if (CollectionUtils.isNotEmpty(orgEOList)) { - String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); - reportDetailVo.setDepartmentName(departmentName); + if (StrUtil.isNotBlank(department)) { + String[] idArray = department.split(","); + List orgEOList = orgEOService.query().in("ID", idArray).list(); + if (CollectionUtils.isNotEmpty(orgEOList)) { + String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); + reportDetailVo.setDepartmentName(departmentName); + } } //设置标签列表 From 89e829781e32663aafa56941973d4bc7c8bad904 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 16:17:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20isAct?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/mysql/ReportManageMapper.xml | 4 ++-- .../mapper/mysql/ReportManageMapper.xml | 4 ++-- .../da/sys/controller/MenuEOController.class | Bin 9257 -> 9328 bytes .../com/adc/da/sys/entity/MenuEO.class | Bin 2776 -> 2981 bytes .../com/adc/da/sys/service/OrgEOService.class | Bin 4955 -> 4967 bytes .../classes/com/adc/da/sys/vo/MenuVO.class | Bin 2943 -> 3148 bytes .../mybatis/mapper/sys/mysql/MenuEOMapper.xml | 3 ++- 7 files changed, 6 insertions(+), 5 deletions(-) diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 4bf88c4..e58e00d 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -228,7 +228,7 @@ ORDER BY updateDate desc