Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java

@@ -79,7 +79,7 @@ public class GridController {
      **/
     @PostMapping("gridlist")
     public Result<GridListInfoResultDTO> gridList(@LoginUser TokenDto tokenDto,@RequestBody CommonAgencyIdFormDTO agencyFormDTO){
-        agencyFormDTO.setAgencyId(tokenDto.getUserId());
+        agencyFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(agencyFormDTO);
         return customerGridService.getGridListByAgency(agencyFormDTO);
     }
@@ -93,7 +93,7 @@ public class GridController {
      **/
     @PostMapping("allgrids")
     public Result<List<GridBaseInfoResultDTO>> allGrids(@LoginUser TokenDto tokenDto, @RequestBody CommonAgencyIdFormDTO agencyFormDTO){
-        agencyFormDTO.setAgencyId(tokenDto.getUserId());
+        agencyFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(agencyFormDTO);
         return customerGridService.getAllGridsByAgency(agencyFormDTO);
     }

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

@@ -19,7 +19,6 @@ package com.epmet.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.CustomerIdDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml

@@ -58,7 +58,7 @@
 
 	  AND agency.USER_ID NOT IN (
         SELECT
-	        grid2.USER_ID
+	        USER_ID
         FROM
 	        CUSTOMER_STAFF_GRID
         WHERE

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -63,7 +63,7 @@
             role.DEL_FLAG = '0'
             AND staff.DEL_FLAG = '0'
             AND rolename.DEL_FLAG = '0'
-            AND staff.ID = #{userId}
+            AND staff.USER_ID = #{userId}
             AND staff.CUSTOMER_ID = #{customerId}
     </select>
 </mapper>