wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-28 10:58:48 +08:00
parent 27be87fc5b a789733f6a
commit 3ef710afc9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
View File

@ -165,12 +165,11 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
if (processInstanceDTO.getProcessVariables().containsKey("backToFirst")) { if (processInstanceDTO.getProcessVariables().containsKey("backToFirst")) {
try { try {
Boolean backToFirst = Boolean.parseBoolean(processInstanceDTO.getProcessVariables().getOrDefault("backToFirst", "false").toString()); Boolean backToFirst = Boolean.parseBoolean(processInstanceDTO.getProcessVariables().getOrDefault("backToFirst", "false").toString());
if (backToFirst.equals(Boolean.TRUE)) { if (Boolean.TRUE.equals(backToFirst)) {
index.put("backToFirst", "true"); index.put("backToFirst", "true");
} else {
index.put("backToFirst", "false");
} }
} catch (Exception exception) { } catch (Exception exception) {
index.put("backToFirst", "false");
logger.info(exception.toString()); logger.info(exception.toString());
} }
} else { } else {

2
renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
View File

@ -66,7 +66,7 @@
<update id="delApplyCamera"> <update id="delApplyCamera">
UPDATE t_ability_application taa UPDATE t_ability_application taa
SET expire_date = now() SET expire_date = '2022-04-01 00:00:00'
WHERE id IN WHERE id IN
<foreach collection="ids" item="item" separator="," open="(" close=")"> <foreach collection="ids" item="item" separator="," open="(" close=")">
#{item} #{item}