111

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/BindApiServiceImpl.java

@@ -49,18 +49,6 @@ public class BindApiServiceImpl implements BindApiService {
 		String storeId = departmentDTO.getRelatedId();
 		StaffDepartmentRelatedDTO oldStaffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(toStaffDepartmentRelatedId);
 		logger.info("===========================》333333333333333");
-		if(StringUtils.isNotEmpty(oldStaffDepartmentRelatedDTO.getClerkCode())){
-			//新店长更新gic姓名
-			List<String> clerkCodes = new ArrayList<>();
-			clerkCodes.add(oldStaffDepartmentRelatedDTO.getClerkCode());
-			List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
-			for(ClerkDTO clerkDTO :list){
-				clerkDTO.setPhoneNumber("--");
-				clerkDTO.setClerkName("--");
-				clerkService.updateClerk(clerkDTO);
-			}
-		}
-		logger.info("===========================》444444444444444");
 		//老店长
 		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
 		if(one != null){
@@ -69,13 +57,25 @@ public class BindApiServiceImpl implements BindApiService {
 			one.setUpdateTime(new Date());
 			staffDepartmentRelatedApiService.deleteCode(one);
 		}
-		logger.info("===========================》555555555555555");
+		logger.info("===========================》444444444444444");
 		//新店长更新好办code
 		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
 		dto.setStaffDepartmentRelatedId(toStaffDepartmentRelatedId);
 		dto.setClerkCode(fromClerkCode);
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
+		logger.info("===========================》555555555555555");
+		if(StringUtils.isNotEmpty(oldStaffDepartmentRelatedDTO.getClerkCode())){
+			//新店长更新gic姓名
+			List<String> clerkCodes = new ArrayList<>();
+			clerkCodes.add(oldStaffDepartmentRelatedDTO.getClerkCode());
+			List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);
+			for(ClerkDTO clerkDTO :list){
+				clerkDTO.setPhoneNumber("--");
+				clerkDTO.setClerkName("--");
+				clerkService.updateClerk(clerkDTO);
+			}
+		}
 		logger.info("===========================》666666666666666");
 
 		//老店长更新gic那边的数据为新店长数据