征求意见导出 bug 以及 批量修改权限 修复

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java

@@ -118,11 +118,11 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             List<SarPublicIdeaAll> data=new ArrayList<>();
             if (!StringUtils.isEmpty(cid)){
-                if (null!=type) {
+//                if (null!=type) {
                     data = sarPublicIdeaAllDao.getPublicAllIdea(cid, type);
-                }else {
+//                }else {
-                    data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type);
+//                    data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type);
-                }
+//                }
             }
             List<GetExcelDto> standExcel=new ArrayList<>();
             List<GetExcelDto2> standExcel2=new ArrayList<>();

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<TsUser> {
         return tsUserService.setPosition(userPositionVO);
     }
 
+
+    @ApiOperation("配置岗位")
+    @PostMapping("/positionBatch")
+    public ResponseMessage<Object> setPositionBatch(@Valid @RequestBody UserPositionBatchVO userPositionVO){
+        return tsUserService.setPositionBatch(userPositionVO);
+    }
+
     @ApiOperation("查询当前登录用户权限")
     @GetMapping("/menu")
     public ResponseMessage<List<SarMenu>> getMenu(){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java

@@ -32,7 +32,7 @@ public interface TsUserDao extends BaseMapper<TsUser> {
      * @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<TsUser> {
      * @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查询用户及其岗位

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<String> userId;
+    @NotNull(message = "positionIds不能为空")
+    private List<String> positionIds;
+}

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<TsUser> {
      */
     ResponseMessage<Object> setPosition(UserPositionVO userPositionVO);
 
+    ResponseMessage<Object> setPositionBatch(UserPositionBatchVO userPositionVO);
+
     /**
      * 查询当前登录的用户权限
      * @return List<SarMenu>

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.*;
-import com.adc.da.slrs.sarUser.entity.TsUser;
 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<TsUserDao, TsUser> implements
         return Result.success();
     }
 
+
+    /**
+     * 配置岗位
+     * @param  userPositionVO2：用户、岗位ID
+     * @return ResponseMessage<Object>
+     */
+    @Override
+    @Transactional
+    public ResponseMessage<Object> 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<String> oldPositionIds=tsUserDao.selectPositionIds(userPositionVO.getUserId());
+            Map<String,List<String>> ids= ListUtil.difList(userPositionVO.getPositionIds(),oldPositionIds);
+            List<String> insertIds=ids.get("insert");
+            List<String> 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<SarMenu>