冲突解决

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @Description 政府端登录信息
@@ -62,5 +63,10 @@ public class GovTokenDto extends BaseTokenDto implements Serializable {
      * 最后一次更新时间
      */
     private long updateTime;
+
+    /**
+     * 功能权限列表，实际上是gov_staff => staff_role => role_operation查询到的operationKey
+     */
+    private List<String> permissions;
 }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@@ -107,4 +107,44 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      * @Date 2020/4/20 21:45
      **/
     Result<List<StaffOrgsResultDTO>> getStaffOrgList(StaffOrgFormDTO staffOrgsFormDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 添加组织
+     */
+    Result<AddAgencyResultDTO> addAgency(AddAgencyFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织名称编辑
+     */
+    Result editAgency(EditAgencyFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 删除组织机关
+     */
+    Result removeAgency(RemoveAgencyFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织首页-获取组织机构信息
+     */
+    Result<AgencydetailResultDTO> agencyDetail(AgencydetailFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 组织首页-下级机关列表
+     */
+    Result<SubAgencyResultDTO> subAgencyList(SubAgencyFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -73,12 +73,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @return
 	 */
 	List<StaffInfoResultDTO> selectCustomerStaffList(StaffsInAgencyFromDTO fromDTO);
-    /**
-     * 根据userId查询查询网格下的用户信息
-     * @param customerStaffGridDTOS
-     * @return
-     */
-    List<StaffGridListDTO> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS);
 
     /**
      * @return com.epmet.entity.CustomerStaffEntity