Merge remote-tracking branch 'origin/dev_special_subject' into develop

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java

@@ -112,4 +112,9 @@ public class SpecialSubjectDTO implements Serializable {
 	 * 扩展属性：标签颜色
 	 */
     private String tagColor;
+
+	/**
+	 * 删除人id
+	 */
+    private String delStaffId;
 }

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/QuerySpecialSubFormDTO.java

@@ -29,4 +29,9 @@ public class QuerySpecialSubFormDTO implements Serializable {
      */
     @NotBlank(message = "pids不能为空", groups = AddUserInternalGroup.class)
     private String pids;
+
+    /**
+     * 当前登录用户userId,
+     */
+    private String userId;
 }

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java

@@ -42,9 +42,15 @@ public class WorkSpecialSubjectResultDTO implements Serializable {
 
     private String addOrgId;
     private String orgLevel;
+
     /**
-     * 创建时间
+     * 创建时间-前端无用
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdTime;
+
+    /**
+     * 创建人-前端无用
+     */
+    private String createdBy;
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java

@@ -93,7 +93,8 @@ public class SpecialSubjectController {
      * @Date 2021/7/15 21:17
      **/
     @PostMapping("existedlist")
-    public Result<List<WorkSpecialSubjectResultDTO>> queryExistedList(@RequestBody QuerySpecialSubFormDTO formDTO) {
+    public Result<List<WorkSpecialSubjectResultDTO>> queryExistedList(@LoginUser TokenDto tokenDto, @RequestBody QuerySpecialSubFormDTO formDTO) {
+        formDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, QuerySpecialSubFormDTO.AddUserInternalGroup.class);
         return new Result<List<WorkSpecialSubjectResultDTO>>().ok(specialSubjectService.queryExistedList(formDTO));
     }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/SpecialSubjectEntity.java

@@ -52,6 +52,7 @@ public class SpecialSubjectEntity extends BaseEpmetEntity {
 
     /**
      * 新增此专题时用户所在的组织id或者网格id
+	 * mean:给谁添加的？？？
      */
 	private String addOrgId;
 
@@ -76,7 +77,13 @@ public class SpecialSubjectEntity extends BaseEpmetEntity {
 
     /**
      * 新增此专题用户所属的组织id
+	 * mean:当前人是谁？
      */
 	private String addUserAgencyId;
 
+	/**
+	 * 删除人id
+	 */
+	private String delStaffId;
+
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java

@@ -197,6 +197,12 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
      */
     @Override
     public List<WorkSpecialSubjectResultDTO> queryExistedList(QuerySpecialSubFormDTO formDTO) {
+        StaffInfoFromDTO staffInfoFromDTO = new StaffInfoFromDTO();
+        staffInfoFromDTO.setStaffId(formDTO.getUserId());
+        Result<MineResultDTO> staffResult = govOrgOpenFeignClient.queryStaffProfile(staffInfoFromDTO);
+        if (staffResult.success() && null != staffResult.getData()) {
+            throw new RenException("查询当前工作人员信息异常");
+        }
         List<WorkSpecialSubjectResultDTO> resultDTOList = new ArrayList<>();
         List<String> notList = new ArrayList<>();
         //当前组织或者网格自己建立的
@@ -207,11 +213,17 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
             result.setSpecialSubjectId(dto.getId());
             result.setTagId(dto.getTagId());
             result.setTagName(dto.getTagName());
-            result.setCanDel(true);
+            //当前工作人员所属的组织，与当时添加人所属的组织一致时，即可删除
+            if(dto.getAddUserAgencyId().equals(staffResult.getData().getAgencyId())){
+                result.setCanDel(true);
+            }else{
+                result.setCanDel(false);
+            }
             result.setAddOrgId(dto.getAddOrgId());
             result.setOrgLevel(dto.getOrgLevel());
             result.setTagColor(dto.getTagColor());
             result.setCreatedTime(dto.getCreatedTime());
+            result.setCreatedBy(dto.getCreatedBy());
             currentOrgList.add(result);
         });
         if (CollectionUtils.isNotEmpty(currentOrgList)) {
@@ -231,11 +243,17 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
                     result.setSpecialSubjectId(dto.getId());
                     result.setTagId(dto.getTagId());
                     result.setTagName(dto.getTagName());
-                    result.setCanDel(false);
+                    //当前工作人员所属的组织，与当时添加人所属的组织一致时，即可删除
+                    if(dto.getAddUserAgencyId().equals(staffResult.getData().getAgencyId())){
+                        result.setCanDel(true);
+                    }else{
+                        result.setCanDel(false);
+                    }
                     result.setAddOrgId(dto.getAddOrgId());
                     result.setOrgLevel(dto.getOrgLevel());
                     result.setTagColor(dto.getTagColor());
                     result.setCreatedTime(dto.getCreatedTime());
+                    result.setCreatedBy(dto.getCreatedBy());
                     resultDTOList.add(result);
                 });
             }

epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.6__add_del_staffid.sql

@@ -0,0 +1 @@
+alter table special_subject add COLUMN DEL_STAFF_ID VARCHAR(64) COMMENT '删除人id' AFTER ADD_USER_AGENCY_ID;

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.SpecialSubjectDao">
 
     <update id="delSpecialSubject" parameterType="map">
-        update special_subject set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=Now()
+        update special_subject set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=Now(),DEL_STAFF_ID=#{userId}
         where id=#{id}
     </update>