diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index b7c52565..0733b025 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -25,6 +25,7 @@ import com.jero.modules.laws.home.service.ILawsHomeSearchService; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsReplacedStandardService; +import com.jero.modules.laws.standardization.common.LawsStandardizationCommon; import com.jero.modules.laws.standardization.entity.LawsStandardization; import com.jero.modules.laws.standardization.service.ILawsStandardizationService; import com.jero.modules.oss.entity.OSSFile; @@ -159,7 +160,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl { LawsStandardization lawsStandardization = new LawsStandardization(); - lawsStandardization.setStandardizationType("分标委"); + lawsStandardization.setStandardizationType(LawsStandardizationCommon.FBW); lawsStandardization.setPid(parentId); eMap.forEach((k,v) -> { if ("code".equals(k)) { @@ -495,7 +496,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java index a6e02fbb..4bdb4844 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java @@ -126,7 +126,6 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService { queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue()); queryWrapper.eq("pn.transfer_flag", YesOrNoEnum.YES.getValue()); queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); - queryWrapper.orderByDesc("par.create_time"); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleIds = loginUser.getRoleIds(); if (!roleIds.contains("admin") && !roleIds.contains("BZGLY")){