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

fix: 内部工作组职务显示

Browse Source
This commit is contained in:
mzaxd
2024-08-23 17:06:19 +08:00
parent 498a4bf2fd
commit 714ce76140
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java
-2
View File
@@ -4,7 +4,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; 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.aspect.annotation.Translation;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck; import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
@@ -78,7 +77,6 @@ public class EnterpriseStandardRecheckPlanController extends JeroController<Ente
@ApiOperation(value="企标复审计划-根据企标Id查询复审列表", notes="企标复审计划-根据企标Id查询复审列表") @ApiOperation(value="企标复审计划-根据企标Id查询复审列表", notes="企标复审计划-根据企标Id查询复审列表")
@GetMapping(value = "/getListByStandardId") @GetMapping(value = "/getListByStandardId")
@Translation @Translation
@DictPoint
public Result<List<ProcessEsRecheck>> getListByStandardId(@RequestParam("standardId") @ApiParam("企标id") String id) { public Result<List<ProcessEsRecheck>> getListByStandardId(@RequestParam("standardId") @ApiParam("企标id") String id) {
return Result.OK(recheckPlanService.getListByStandardId(id)); return Result.OK(recheckPlanService.getListByStandardId(id));
} }
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+1
View File
@@ -137,6 +137,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
workingGroupUser.setWorkingGroupId(lawsWorkingGroupUser.getWorkingGroupId()); workingGroupUser.setWorkingGroupId(lawsWorkingGroupUser.getWorkingGroupId());
workingGroupUser.setUserId(id); workingGroupUser.setUserId(id);
workingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); workingGroupUser.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
workingGroupUser.setJob(lawsWorkingGroupUser.getJob());
groupUsers.add(workingGroupUser); groupUsers.add(workingGroupUser);
} }
lawsWorkingGroupUserService.saveBatch(groupUsers); lawsWorkingGroupUserService.saveBatch(groupUsers);
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
@NotNull @NotNull
private QueryWrapper<LawsWorkingGroupUser> getWrapper(String realname, String userName, String userRoleName, String userPostName, String workingGroupId, String searchType) { private QueryWrapper<LawsWorkingGroupUser> getWrapper(String realname, String userName, String userRoleName, String userPostName, String workingGroupId, String searchType) {
QueryWrapper<LawsWorkingGroupUser> wrapper = new QueryWrapper<>(); 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")) { if (searchType == null || searchType.equals("2")) {
List<String> workingGroupIds = getWorkingGroupIds(workingGroupId); List<String> workingGroupIds = getWorkingGroupIds(workingGroupId);
if(!CollectionUtils.isEmpty(workingGroupIds)){ if(!CollectionUtils.isEmpty(workingGroupIds)){