Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/UserMessageDao.xml

@@ -84,7 +84,7 @@
 
     <delete id="delReadMsg">
         UPDATE user_message
-        SET del_flag = '0',
+        SET del_flag = '1',
             updated_by = #{userId},
             updated_time = NOW()
         WHERE

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.9__alter_org.sql

@@ -1,14 +1,14 @@
 
 ALTER TABLE `customer_agency`
 ADD COLUMN `CONTACTS`  varchar(64) NULL COMMENT '负责人' AFTER `PARENT_AREA_CODE`,
-ADD COLUMN `MOBILE`  varchar(32) NULL COMMENT '联系电话' AFTER `PERSON`;
+ADD COLUMN `MOBILE`  varchar(32) NULL COMMENT '联系电话' AFTER `CONTACTS`;
 
 ALTER TABLE `customer_department`
 ADD COLUMN `CODE`  varchar(64) NULL COMMENT '编码' AFTER `UPDATED_TIME`,
 ADD COLUMN `CONTACTS`  varchar(64) NULL COMMENT '负责人' AFTER `CODE`,
-ADD COLUMN `MOBILE`  varchar(32) NULL COMMENT '联系电话' AFTER `PERSON`;
+ADD COLUMN `MOBILE`  varchar(32) NULL COMMENT '联系电话' AFTER `CONTACTS`;
 
 ALTER TABLE `customer_grid`
 ADD COLUMN `GRID_TYPE`  varchar(64) NULL COMMENT '网格类型【字典表sys_dict_data,key:grid_type】' AFTER `PIDS`,
 ADD COLUMN `CONTACTS`  varchar(64) NULL COMMENT '负责人' AFTER `GRID_TYPE`,
-ADD COLUMN `MOBILE`  varchar(32) NULL COMMENT '联系电话' AFTER `PERSON`;
+ADD COLUMN `MOBILE`  varchar(32) NULL COMMENT '联系电话' AFTER `CONTACTS`;

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

@@ -484,9 +484,9 @@ public class CustomerStaffController {
      * @Description 【事件】网格员服务电话
      **/
     @PostMapping(value = "gridmobilelist")
-    public Result<List<GridMobileListResultDTO>> gridMobileList(@RequestBody GridMobileListFormDTO formDTO) {
+    public Result<List<GridMobileListResultDTO>> gridMobileList(@LoginUser TokenDto tokenDto, @RequestBody GridMobileListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, GridMobileListFormDTO.Gridobile.class);
-        return new Result<List<GridMobileListResultDTO>>().ok(customerStaffService.gridMobileList(formDTO.getGridId()));
+        return new Result<List<GridMobileListResultDTO>>().ok(customerStaffService.gridMobileList(formDTO.getGridId(), tokenDto.getUserId()));
     }
 
 

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

@@ -346,5 +346,5 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Author sun
 	 * @Description 【事件】网格员服务电话
 	 **/
-    List<GridMobileListResultDTO> gridMobileList(String gridId);
+    List<GridMobileListResultDTO> gridMobileList(String gridId, String userId);
 }

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

@@ -804,11 +804,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	 * @Description 【事件】网格员服务电话
 	 **/
 	@Override
-	public List<GridMobileListResultDTO> gridMobileList(String gridId) {
+	public List<GridMobileListResultDTO> gridMobileList(String gridId, String userId) {
 		List<GridMobileListResultDTO> resultList = new ArrayList<>();
 		//1.查询网格下工作人员列表
 		CommonGridIdFormDTO dto = new CommonGridIdFormDTO();
 		dto.setGridId(gridId);
+		dto.setUserId(userId);
 		Result<List<String>> gridStaffs = govOrgOpenFeignClient.getGridStaffs(dto);
 		if (!gridStaffs.success()) {
 			throw new RenException("获取网格下工作人员列表失败!");