Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java

@@ -15,7 +15,6 @@ import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.opendata.dao.GridstaffInfoPingyinDao;
 import com.epmet.opendata.dto.form.GridStaffInfoFormDTO;
 import com.epmet.opendata.dto.form.StaffBaseInfoFormDTO;
-import com.epmet.opendata.entity.ExUserEntity;
 import com.epmet.opendata.entity.GridstaffInfoPingyinEntity;
 import com.epmet.opendata.service.GridstaffInfoPingyinService;
 import lombok.extern.slf4j.Slf4j;
@@ -118,6 +117,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
             entity.setGridName(r.getGridName());
             entity.setUserType("01");
             entity.setIsLeave("N");
+            entity.setGridUserId(r.getStaffId());
             if (!"staff_create".equals(formDTO.getType())) {
                 baseDao.edit(entity);
             }else {
@@ -129,4 +129,4 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffIn
     }
 
 
-}
+}