diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java index bdf41e7c..d7507b18 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java @@ -4,7 +4,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.aspect.annotation.Translation; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck; @@ -78,7 +77,6 @@ public class EnterpriseStandardRecheckPlanController extends JeroController> getListByStandardId(@RequestParam("standardId") @ApiParam("企标id") String id) { return Result.OK(recheckPlanService.getListByStandardId(id)); } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java index f7032e6a..22b5c6c5 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java @@ -137,6 +137,7 @@ public class LawsWorkingGroupUserController extends JeroController getWrapper(String realname, String userName, String userRoleName, String userPostName, String workingGroupId, String searchType) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("user_id","max(working_group_id) as working_group_id","max(id) as id"); + wrapper.select("user_id","max(working_group_id) as working_group_id","max(id) as id", "job"); if (searchType == null || searchType.equals("2")) { List workingGroupIds = getWorkingGroupIds(workingGroupId); if(!CollectionUtils.isEmpty(workingGroupIds)){