冲突解决

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

@@ -2,19 +2,21 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.StaffGridVisitedFormDTO;
+import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
+import com.epmet.dto.form.StaffGridVisitedFormDTO;
+import com.epmet.dto.form.StaffRoleFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import com.epmet.dto.form.StaffRoleFormDTO;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 
 /**

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java

@@ -20,12 +20,16 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.StaffAgencyConstant;
+import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.dto.form.StaffGridVisitedFormDTO;
 import com.epmet.dto.form.SwitchGridFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.service.StaffAgencyService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;