Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -454,8 +454,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 							logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
 							clerkDTO.setClerkName(staffDTO.getStaffName());
 							clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
-							//clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
-							clerkDTO.setImageUrl(staffDTO.getHeadImg());
+							clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
 							clerkService.updateClerk(clerkDTO);
 						}
 						//}
@@ -642,7 +641,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 		String nationcode = clerkDTO.getNationcode();
 		Integer sex = clerkDTO.getClerkGender();
 		String headPic = clerkDTO.getHeadImgUrl();
-		Integer status = 1;
+		Integer status = clerkDTO.getStatus();
+		if(status == null){
+			status = 1;
+		}
 		String postion = clerkDTO.getPostionName();
 		String enterpriseId = clerkDTO.getEnterpriseId();
 
@@ -696,10 +698,12 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    	}
 	    }else{
 	    	String staffId = staff.getStaffId();
+	    	logger.info("【员工修改】staff={},status={}",JSON.toJSONString(staff),status);
 	    	//删除
 	    	if(status == 0){
 	    		StaffDepartmentRelatedDTO staffRelated = this.getDepartmentIdAndStaffId(departmentId, staffId);
 	    		if(staffRelated != null){
+	    			staffRelated.setUpdateTime(new Date());
 	    			staffRelated.setClerkCode(null);
 					staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, staffRelated));
 	    		}
@@ -729,11 +733,13 @@ public class StaffApiServiceImpl implements StaffApiService {
 				StaffDepartmentRelatedDTO isCodeExist = this.getDepartmentIdAndCode(departmentId,code);
 				//如果这个人已经绑定了  先解绑
 				if(isCodeExist != null){
+					staffRelated.setUpdateTime(new Date());
 					isCodeExist.setClerkCode(null);
 					staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, isCodeExist));
 				}
 				//如果这个人是未绑定的 则绑定clerk
 				if(staffRelated != null){
+					staffRelated.setUpdateTime(new Date());
 					staffRelated.setClerkCode(code);
 					staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, staffRelated));
 				}