Merge remote-tracking branch 'origin/dev_bugfix' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -99,22 +99,6 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      */
     List<UserIdAndPidDTO> selectUserIdByGridId(CustomerGridFormDTO customerGridFormDTO);
 
-    /**
-     * 根据userId查询customerId
-     *
-     * @param userId
-     * @return
-     */
-    String selectCustomerIdByUserId(@Param("userId") String userId);
-
-    /**
-     * 根据pid查询pids
-     *
-     * @param pid
-     * @return
-     */
-    String selectPidsByPid(@Param("pid") String pid);
-
     /**
      * 根据gridName查询gridId
      *

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -140,14 +140,6 @@ public interface EpmetUserFeignClient {
 	@PostMapping("/epmetuser/customerstaff/getdepartmentstafflist")
 	Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(@RequestBody DepartmentInStaffFormDTO departmentInStaffFormDTO);
 
-	/**
-	 *	根据userId查询customerId
-	 * @param  addDepartmentStaffFormDTO
-	 * @auther zxc
-	 */
-	@PostMapping("/epmetuser/customerstaff/selectcustomeridbyuserid")
-	Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
-
 	/**
 	 * @Description 通过userId列表查询未被禁用的用户信息
 	 * @Param CommonUserIdListFormDTO :: getUserIdList

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -91,11 +91,6 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     public Result disabledStaff(StaffInfoFromDTO fromDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabledStaff", fromDTO);
     }
-    @Override
-    public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectCustomerIdByUserId", addDepartmentStaffFormDTO);
-    }
-
 
     @Override
     public Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(CommonUserIdListFormDTO userIdList) {

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

@@ -227,9 +227,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             }
         }
         baseDao.insert(customerGridEntity);
-        //查询刚刚添加的gridId
-        AddGridResultDTO addGridResultDTO = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(), addGridFormDTO.getAgencyId(), null);
-        return new Result<AddGridResultDTO>().ok(addGridResultDTO);
+        AddGridResultDTO resultDTO = new AddGridResultDTO();
+        resultDTO.setGridId(customerGridEntity.getId());
+        return new Result<AddGridResultDTO>().ok(resultDTO);
     }
 
     /**

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

@@ -157,28 +157,6 @@
 	        AND csg.grid_id = #{gridId}
     </select>
 
-    <!-- 根据userId查询customerId -->
-    <select id="selectCustomerIdByUserId" resultType="string">
-        SELECT
-            customer_id
-        FROM
-            customer_staff_grid
-        WHERE
-            user_id = #{userId}
-            LIMIT 1
-    </select>
-
-    <!-- 根据pid查询pids -->
-    <select id="selectPidsByPid" resultType="string">
-        SELECT
-            pids
-        FROM
-            customer_agency
-        WHERE
-            id = #{pid}
-            limit 1
-    </select>
-
     <!-- 根据gridName查询gridId -->
     <select id="selectGridIdByGridName" resultType="com.epmet.dto.result.AddGridResultDTO">
         SELECT

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -180,12 +180,6 @@ public class CustomerStaffController {
         return customerStaffService.selectGridStaffCountByUserId(userIdDTO);
     }
 
-
-    @PostMapping(value = "selectcustomeridbyuserid")
-    public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(@RequestBody AddDepartmentStaffFormDTO addDepartmentStaffFormDTO){
-        return customerStaffService.selectCustomerIdByUserId(addDepartmentStaffFormDTO);
-    }
-
     /**
      * 人员添加页面初始化
      *

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

@@ -115,13 +115,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 */
     List<DepartInStaffListResultDTO> selectDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
 
-    /**
-     *
-     * @param  departmentStaffFormDTO
-     * @auther zxc
-     */
-    List<CustomerIdDTO> selectCustomerIdByUserId(AddDepartmentStaffFormDTO departmentStaffFormDTO);
-
     /**
      * @Description  根据UserId列表查询用信息，过滤掉被禁用的，包含未激活的
      * @Param List<String>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -21,12 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
-import com.epmet.dto.form.*;
 import com.epmet.dto.CustomerStaffDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CommonUserIdListFormDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
 import com.epmet.dto.form.StaffSubmitFromDTO;
@@ -218,13 +215,6 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 */
 	Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
 
-	/**
-	 *	根据userId查询customerId
-	 * @param:	addDepartmentStaffFormDTO
-	 * @auther: zxc
-	 */
-	Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
-
 	/**
 	 * @Description 通过userId列表查询未被禁用的用户信息
 	 * @Param CommonUserIdListFormDTO :: getUserIdList

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -403,15 +403,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return new Result<List<DepartInStaffListResultDTO>>().ok(staffList);
 	}
 
-	/**
-	 * @param: addDepartmentStaffFormDTO
-	 * @auther: zxc
-	 */
-	@Override
-	public Result<List<CustomerIdDTO>> selectCustomerIdByUserId(AddDepartmentStaffFormDTO addDepartmentStaffFormDTO) {
-		return new Result<List<CustomerIdDTO>>().ok(baseDao.selectCustomerIdByUserId(addDepartmentStaffFormDTO));
-	}
-
 	/**
 	 * @return Result<List < CommonStaffInfoResultDTO>>
 	 * @Description 通过userId列表查询未被禁用的用户信息

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

@@ -160,22 +160,6 @@
         ORDER BY CONVERT (real_name USING gbk) ASC<!--按中文对应的拼音升序排列-->
     </select>
 
-    <!-- 根据userId查询customerId -->
-    <select id="selectCustomerIdByUserId" parameterType="com.epmet.dto.form.AddDepartmentStaffFormDTO" resultType="com.epmet.dto.CustomerIdDTO">
-        SELECT
-            user_id AS userId,
-            customer_id AS customerId
-        FROM
-            customer_staff
-        WHERE
-            user_id in
-            <foreach item="item" collection="selectedList" separator="," open="(" close=")" index="">
-                #{item}
-            </foreach>
-            AND del_flag = 0
-            AND enable_flag = 'enable'
-    </select>
-
     <!-- 根据UserId列表查询用户Id、头像、昵称，过滤掉被禁用的，包含未激活的-->
     <select id="selectEnableStaffMsg" resultType="com.epmet.dto.result.CommonStaffInfoResultDTO">
         SELECT