111

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -269,6 +269,7 @@ public class ClerkController extends WebBaseController{
 			List<ClerkDTO> oldList = clerkService.listClerk(storeId, oldClerkCodes, true);
 			for(ClerkDTO clerkDTO :oldList){
 				clerkDTO.setPhoneNumber("--");
+				clerkDTO.setClerkName("--");
 				clerkService.updateClerk(clerkDTO);
 			}
 
@@ -328,6 +329,21 @@ public class ClerkController extends WebBaseController{
 		if(StringUtils.isAnyBlank(fromClerkCode,toStaffDepartmentRelatedId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
+		String storeId = departmentDTO.getRelatedId();
+		StaffDepartmentRelatedDTO oldStaffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(toStaffDepartmentRelatedId);
+		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);
+			}
+		}
+		//老店长清空
 		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(fromClerkCode,departmentId);
 		if(one != null){
 			//存在，则先置空
@@ -343,8 +359,7 @@ public class ClerkController extends WebBaseController{
 		staffDepartmentRelatedApiService.updateById(dto);
 		
 		//更新gic数据
-		DepartmentDTO departmentDTO = departmentApiService.selectById(departmentId);
-		String storeId = departmentDTO.getRelatedId();
+
 		List<String> clerkCodes = new ArrayList<>();
 		clerkCodes.add(fromClerkCode);
 		List<ClerkDTO> list = clerkService.listClerk(storeId, clerkCodes, true);