FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20230829_change' into 'fix_foton_20231031'

Browse Source 
# Conflicts:
#   adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
This commit is contained in:
高嵩
2023-11-20 01:06:48 +00:00
parent 31a775e2d0 b1d1be63d8
commit 54034ff747
68 changed files with 2119 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarLawsInformationEOService.java
+4 -5
View File
@@ -29,17 +29,16 @@ public class ActSarLawsInformationEOService {
SarLawsInformation sarLawsInformation = JSONObject.parseObject(lawsInformationInfo, SarLawsInformation.class);
JSONObject jsonObject = JSONObject.parseObject(lawsInformationInfo);
String applyUserId = jsonObject.getString("applyUserId");
String applyUserName = jsonObject.getString("applyUserName");
// String applyUserName = jsonObject.getString("applyUserName");
String approverId = jsonObject.getString("approverId");
String approverName = jsonObject.getString("approverName");
// String approverName = jsonObject.getString("approverName");
String createAndApproveBy = "";
// 判断发起人和审批人是否相同
if (approverId.equals(applyUserId)) {
createAndApproveBy = applyUserName + "(" + applyUserId + ")";
createAndApproveBy = applyUserId;
}else {
createAndApproveBy = applyUserName + "(" + applyUserId + ")," + approverName + "(" + approverId + ")";
createAndApproveBy = applyUserId + "," + approverId;
}
sarLawsInformation.setCreateAndApproveBy(createAndApproveBy);
sarLawsInformation.setDownloadableBy(createAndApproveBy);
sarLawsInformation.setViewableBy(createAndApproveBy);
logger.info("政策法规资料入库：" + sarLawsInformation);