ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/thirdStage' into thirdStage

Browse Source
This commit is contained in:
yjz
2024-01-23 14:41:02 +08:00
parent bd53579da3 2205f5d3ae
commit adc16485f9
7 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java
+5
View File
@@ -121,6 +121,11 @@ public class ResultCommon {
* 只能催办待办任务 * 只能催办待办任务
*/ */
public static final String TASK_URGING_ERROR = "task.urging.error"; public static final String TASK_URGING_ERROR = "task.urging.error";
/**
* 暂无该流程催办权限
*/
public static final String TASK_URGING_ERROR_2 = "task.urging.error.2";
/** /**
* 草稿不存在 * 草稿不存在
laws-base/laws-base-core/src/main/java/com/jero/config/filter/cors/CorsFilter.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class CorsFilter implements Filter {
String[] ieBrowserSignals = {"MSIE", "Trident"}; String[] ieBrowserSignals = {"MSIE", "Trident"};
String userAgent = request.getHeader("User-Agent"); String userAgent = request.getHeader("User-Agent");
for (String signal : ieBrowserSignals) { for (String signal : ieBrowserSignals) {
if (userAgent.contains(signal)){ if (userAgent != null && userAgent.contains(signal)){
return true; return true;
} }
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+1
View File
@@ -595,6 +595,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
term1.setAssessResults(assessResults); term1.setAssessResults(assessResults);
if(StringUtils.isBlank(designEngineer1)){ if(StringUtils.isBlank(designEngineer1)){
designEngineer1 = termUser.getModuleOwner(); designEngineer1 = termUser.getModuleOwner();
updateTermUser.setDescription(termUser.getNotInvolved());
} }
if(StringUtils.isBlank(designEngineer1)){ if(StringUtils.isBlank(designEngineer1)){
designEngineer1 = termUser.getResponsibleUnitLeader(); designEngineer1 = termUser.getResponsibleUnitLeader();
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+1 -1
View File
@@ -266,7 +266,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
.collect(Collectors.toList()); .collect(Collectors.toList());
String loginUserId = CurrentUserUtil.getId(); String loginUserId = CurrentUserUtil.getId();
if (!canUrgingUserList.contains(loginUserId)){ if (!canUrgingUserList.contains(loginUserId)){
throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION); throw new JeroBootException(ResultCommon.TASK_URGING_ERROR_2);
} }
//获得流程总表，发送消息 //获得流程总表，发送消息
laws-single-startup/src/main/resources/i18n/messages.properties
+2 -1
View File
@@ -68,4 +68,5 @@ en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u97
tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002 tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002
task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1 task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1
invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9 invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9 can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9
task.urging.error.2=\u6682\u65E0\u8BE5\u6D41\u7A0B\u50AC\u529E\u6743\u9650
laws-single-startup/src/main/resources/i18n/messages_en.properties
+2 -1
View File
@@ -73,4 +73,5 @@ en.standard.number.conflict=standard number exists
tag.add.error.2=each table can have a maximum of 50 fields. tag.add.error.2=each table can have a maximum of 50 fields.
task.urging.error=Can only remind to do tasks task.urging.error=Can only remind to do tasks
invalid.esp=Invalid enterprise standard, please check invalid.esp=Invalid enterprise standard, please check
can.not.edit.abolish.or.archive.es=Can not edit abolished or archived enterprise standards, please check can.not.edit.abolish.or.archive.es=Can not edit abolished or archived enterprise standards, please check
task.urging.error.2=I currently do not have the authority to urge this process
laws-single-startup/src/main/resources/i18n/messages_zh.properties
+2 -1
View File
@@ -73,4 +73,5 @@ en.standard.number.conflict=\u4F01\u6807\u7F16\u53F7\u5DF2\u5B58\u5728\uFF0C\u97
tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002 tag.add.error.2=\u6BCF\u5F20\u8868\u6700\u591A\u670950\u4E2A\u5B57\u6BB5\u3002
task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1 task.urging.error=\u53EA\u80FD\u50AC\u529E\u5F85\u529E\u4EFB\u52A1
invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9 invalid.esp=\u65E0\u6548\u7684\u4F01\u6807\u8BA1\u5212\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9
can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9 can.not.edit.abolish.or.archive.es=\u5DF2\u5E9F\u6B62\u6216\u5DF2\u5F52\u6863\u7684\u4F01\u6807\u8BA1\u5212\u4E0D\u80FD\u7F16\u8F91,\u8BF7\u91CD\u65B0\u9009\u62E9
task.urging.error.2=\u6682\u65E0\u8BE5\u6D41\u7A0B\u50AC\u529E\u6743\u9650