From 043c3e8929a54c16f4ffd4bf4a74b4d5b6b5ccdf Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 6 Jan 2022 13:56:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=20bug=20=E4=BB=A5=E5=8F=8A=20=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarPublicIdeaAllController.java | 8 ++-- .../sarUser/controller/TsUserController.java | 8 ++++ .../adc/da/slrs/sarUser/dao/TsUserDao.java | 4 +- .../sarUser/entity/UserPositionBatchVO.java | 14 ++++++ .../slrs/sarUser/service/ITsUserService.java | 3 ++ .../service/impl/TsUserServiceImpl.java | 47 +++++++++++++++++-- 6 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UserPositionBatchVO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index dbd56663..82fb5ece 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -118,11 +118,11 @@ public class SarPublicIdeaAllController extends BaseController response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - if (null!=type) { +// if (null!=type) { data = sarPublicIdeaAllDao.getPublicAllIdea(cid, type); - }else { - data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type); - } +// }else { +// data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type); +// } } List standExcel=new ArrayList<>(); List standExcel2=new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index 300b63ab..a60290a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -10,6 +10,7 @@ import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUrl.dao.TsUrlDao; import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.entity.UpDTO; +import com.adc.da.slrs.sarUser.entity.UserPositionBatchVO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -60,6 +61,13 @@ public class TsUserController extends BaseController { return tsUserService.setPosition(userPositionVO); } + + @ApiOperation("配置岗位") + @PostMapping("/positionBatch") + public ResponseMessage setPositionBatch(@Valid @RequestBody UserPositionBatchVO userPositionVO){ + return tsUserService.setPositionBatch(userPositionVO); + } + @ApiOperation("查询当前登录用户权限") @GetMapping("/menu") public ResponseMessage> getMenu(){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java index 012cc4e8..9f231fe6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java @@ -32,7 +32,7 @@ public interface TsUserDao extends BaseMapper { * @param positionId：岗位ID */ @Insert("insert into ts_user_position (user_id,position_id) values (#{userId},#{positionId})") - void addPosition(String userId, String positionId); + void addPosition(@Param("userId") String userId,@Param("positionId")String positionId); /** * 解绑岗位 @@ -40,7 +40,7 @@ public interface TsUserDao extends BaseMapper { * @param positionId：岗位ID */ @Delete("delete from ts_user_position where user_id=#{userId} and position_id=#{positionId}") - void delPosition(String userId, String positionId); + void delPosition(@Param("userId")String userId, @Param("positionId")String positionId); /** * 通过岗位ID查询用户及其岗位 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UserPositionBatchVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UserPositionBatchVO.java new file mode 100644 index 00000000..336a011e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UserPositionBatchVO.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.sarUser.entity; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class UserPositionBatchVO { + @NotNull(message = "userId不能为空") + private List userId; + @NotNull(message = "positionIds不能为空") + private List positionIds; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index ad53434a..9e33e87e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.entity.UpDTO; +import com.adc.da.slrs.sarUser.entity.UserPositionBatchVO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -44,6 +45,8 @@ public interface ITsUserService extends IService { */ ResponseMessage setPosition(UserPositionVO userPositionVO); + ResponseMessage setPositionBatch(UserPositionBatchVO userPositionVO); + /** * 查询当前登录的用户权限 * @return List diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 2ff1ec6b..d3298b95 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -11,11 +11,8 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarRole.service.ITsRoleService; -import com.adc.da.slrs.sarUser.entity.SyncUser; -import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.entity.*; import com.adc.da.slrs.sarUser.dao.TsUserDao; -import com.adc.da.slrs.sarUser.entity.UpDTO; -import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sync.service.SyncUserService; import com.adc.da.sys.entity.UserEO; @@ -144,6 +141,48 @@ public class TsUserServiceImpl extends ServiceImpl implements return Result.success(); } + + /** + * 配置岗位 + * @param userPositionVO2：用户、岗位ID + * @return ResponseMessage + */ + @Override + @Transactional + public ResponseMessage setPositionBatch(UserPositionBatchVO userPositionVO2) { + + boolean flag=true; + + for (String s:userPositionVO2.getUserId()) { + UserPositionVO userPositionVO=new UserPositionVO(); + userPositionVO.setUserId(s); + userPositionVO.setPositionIds(userPositionVO2.getPositionIds()); + TsUser tsUser=tsUserDao.selectById(userPositionVO.getUserId()); + if(tsUser==null){ + flag=false; + } + List oldPositionIds=tsUserDao.selectPositionIds(userPositionVO.getUserId()); + Map> ids= ListUtil.difList(userPositionVO.getPositionIds(),oldPositionIds); + List insertIds=ids.get("insert"); + List deleteIds=ids.get("delete"); + if(insertIds!=null&&insertIds.size()>0){ + for(String positionId:insertIds){ + tsUserDao.addPosition(userPositionVO.getUserId(),positionId); + } + } + if(deleteIds!=null&&deleteIds.size()>0){ + for(String positionId:deleteIds){ + tsUserDao.delPosition(userPositionVO.getUserId(),positionId); + } + } + } + if (flag) { + return Result.success(); + }else { + return Result.error("用户不存在"); + } + } + /** * 查询当前登录的用户权限 * @return List From 7f2d7b6454d39dd6695a1eea17ef4baac01996d6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 6 Jan 2022 14:14:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=B8=85=E5=8D=95=20=E5=AF=BC=E8=87=B4=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarLawsDetailedListServiceImpl.java | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 2d8b6f97..94dab8b3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -318,53 +318,55 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl pageRes = new Page<>(page, pageSize); IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); - if ("1".equals(sortKey)) { - Map map = iDicTypeEOService.getDicTypeListCode(); - List list = userIPage.getRecords(); - List> arr = (List>) map.get("COUNTRY"); - for (SarLawsDetailedList list1 : list) { - if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")) { - String[] split = list1.getCountryArea().split(","); - StringBuilder builder = new StringBuilder(); - for (String s : split) { + if ( userIPage.getRecords().size()>0){ + if ("1".equals(sortKey)) { + Map map = iDicTypeEOService.getDicTypeListCode(); + List list = userIPage.getRecords(); + List> arr = (List>) map.get("COUNTRY"); + for (SarLawsDetailedList list1 : list) { + if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")) { + String[] split = list1.getCountryArea().split(","); + StringBuilder builder = new StringBuilder(); + for (String s : split) { + for (Map map1 : arr) { + if (map1.get("value").equals(s)) { + s = map1.get("value"); + builder.append(s + ","); + break; + } + } + } + String completedString = ""; + if (builder.length() > 0) { + completedString = builder.delete(builder.length() - 1, builder.length()).toString(); + } + list1.setCountryArea(completedString); + } else { for (Map map1 : arr) { - if (map1.get("value").equals(s)) { - s = map1.get("value"); - builder.append(s + ","); + if (map1.get("value").equals(list1.getCountryArea())) { + list1.setCountryArea(map1.get("value")); break; } } } - String completedString = ""; - if (builder.length() > 0) { - completedString = builder.delete(builder.length() - 1, builder.length()).toString(); - } - list1.setCountryArea(completedString); - } else { - for (Map map1 : arr) { - if (map1.get("value").equals(list1.getCountryArea())) { - list1.setCountryArea(map1.get("value")); - break; - } - } } + userIPage.setRecords(list); } - userIPage.setRecords(list); + List names = new ArrayList<>(); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + names.add(sarLawsDetailedList.getUpdatePeople()); + }); + List upDTOS = iTsUserService.selectNameById(names, "0"); + Map stringMap = new HashMap<>(); + upDTOS.forEach(upDTO -> { + stringMap.put(upDTO.getId(), upDTO.getValue()); + }); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) { + sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople())); + } + }); } - List names = new ArrayList<>(); - userIPage.getRecords().forEach(sarLawsDetailedList -> { - names.add(sarLawsDetailedList.getUpdatePeople()); - }); - List upDTOS = iTsUserService.selectNameById(names, "0"); - Map stringMap = new HashMap<>(); - upDTOS.forEach(upDTO -> { - stringMap.put(upDTO.getId(), upDTO.getValue()); - }); - userIPage.getRecords().forEach(sarLawsDetailedList -> { - if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) { - sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople())); - } - }); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); return userIPage; From 5a78c69bcc90a9c1c7cb59b8e2ed8bb97c56582f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 6 Jan 2022 15:00:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E7=B2=BE=E7=A1=AE=E6=9F=A5=E8=AF=A2=3D=3D=3D=E3=80=8B=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandProjectLibrary/SarStandProjectLibraryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 604fb89c..660d2263 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -146,7 +146,7 @@ AND library.project_group LIKE concat(concat('%',#{qu.projectGroup}),'%') - AND library.project_status LIKE concat(concat('%',#{qu.projectStatus}),'%') + AND library.project_status = #{qu.projectStatus} AND library.current_node LIKE concat(concat('%',#{qu.currentNode}),'%')