From 714ce76140f1a1d421397431357cecb74f274845 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 23 Aug 2024 17:06:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=85=E9=83=A8=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E8=81=8C=E5=8A=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EnterpriseStandardRecheckPlanController.java     | 2 --
 .../modules/sys/controller/LawsWorkingGroupUserController.java  | 1 +
 .../sys/service/impl/LawsWorkingGroupUserServiceImpl.java       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

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<Ente
 	@ApiOperation(value="企标复审计划-根据企标Id查询复审列表", notes="企标复审计划-根据企标Id查询复审列表")
 	@GetMapping(value = "/getListByStandardId")
 	@Translation
-	@DictPoint
 	public Result<List<ProcessEsRecheck>> 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<LawsWorkingGr
             workingGroupUser.setWorkingGroupId(lawsWorkingGroupUser.getWorkingGroupId());
             workingGroupUser.setUserId(id);
             workingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
+            workingGroupUser.setJob(lawsWorkingGroupUser.getJob());
             groupUsers.add(workingGroupUser);
         }
         lawsWorkingGroupUserService.saveBatch(groupUsers);
diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
index 6f9bd4ed..f78c952b 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
@@ -93,7 +93,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
 	@NotNull
 	private QueryWrapper<LawsWorkingGroupUser> getWrapper(String realname, String userName, String userRoleName, String userPostName, String workingGroupId, String searchType) {
 		QueryWrapper<LawsWorkingGroupUser> 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<String> workingGroupIds = getWorkingGroupIds(workingGroupId);
 			if(!CollectionUtils.isEmpty(workingGroupIds)){