111

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

@@ -84,10 +84,12 @@ public class ClerkController extends WebBaseController{
 	}
 	//成员绑定
 	@RequestMapping("/staff-bind")
-	public HaobanResponse staffBind(String oldClerkCode,String toClerkCode,String fromStaffDepartmentRelatedId) {
-		if(StringUtils.isAnyBlank(oldClerkCode,toClerkCode,fromStaffDepartmentRelatedId)){
+	public HaobanResponse staffBind(String toClerkCode,String fromStaffDepartmentRelatedId) {
+		if(StringUtils.isAnyBlank(toClerkCode,fromStaffDepartmentRelatedId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
+
 		//将指定人绑定clerkCode
 		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
 		dto.setStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
@@ -95,7 +97,6 @@ public class ClerkController extends WebBaseController{
 		dto.setUpdateTime(new Date());
 		staffDepartmentRelatedApiService.updateById(dto);
 		//更新gic数据
-		StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(fromStaffDepartmentRelatedId);
 		DepartmentDTO departmentDTO = departmentApiService.selectById(staffDepartmentRelatedDTO.getDepartmentId());
 		String storeId = departmentDTO.getRelatedId();
 		List<String> clerkCodes = new ArrayList<>();
@@ -108,12 +109,15 @@ public class ClerkController extends WebBaseController{
 			clerkService.updateClerk(clerkDTO);
 		}
 		//清空gic原来的手机号
-		List<String> oldClerkCodes = new ArrayList<>();
-		oldClerkCodes.add(oldClerkCode);
-		List<ClerkDTO> oldList = clerkService.listClerk(storeId, oldClerkCodes, true);
-		for(ClerkDTO clerkDTO :oldList){
-			clerkDTO.setPhoneNumber("--");
-			clerkService.updateClerk(clerkDTO);
+		if(StringUtils.isNotBlank(staffDepartmentRelatedDTO.getClerkCode())){
+			List<String> oldClerkCodes = new ArrayList<>();
+			oldClerkCodes.add(staffDepartmentRelatedDTO.getClerkCode());
+			List<ClerkDTO> oldList = clerkService.listClerk(storeId, oldClerkCodes, true);
+			for(ClerkDTO clerkDTO :oldList){
+				clerkDTO.setPhoneNumber("--");
+				clerkDTO.setClerkName("--");
+				clerkService.updateClerk(clerkDTO);
+			}
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}