Merge remote-tracking branch 'origin/developer' into developer

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

@@ -439,7 +439,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                         logger.info("clerkDto:{}", JSONObject.toJSONString(clerkDTO));
                         String headPic = staffDTO.getHeadImg();
 						if(clerkDTO != null && (StringUtils.isNotBlank(staffName) && !clerkDTO.getClerkName().equals(staffName) || !staffDTO.getPhoneNumber().equals(clerkDTO.getPhoneNumber())) 
-								|| (org.apache.commons.lang3.StringUtils.isNotBlank(headPic) && !headPic.equals(clerkDTO.getImageUrl())) 
+								|| (org.apache.commons.lang3.StringUtils.isNotBlank(headPic) && !headPic.equals(clerkDTO.getHeadImgUrl())) 
 								|| !staffDTO.getSex().equals(clerkDTO.getClerkGender())){
 							logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
 							clerkDTO.setClerkName(staffDTO.getStaffName());

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

@@ -186,27 +186,6 @@ public class ApplicationController extends WebBaseController{
 		}
 	}
 	
-	@RequestMapping("init-wx-department")
-	public HaobanResponse initWxDepartment(){
-		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
-		String wxEnterpriseId = login.getWxEnterpriseId();
-		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
-		if(enterpriseDTO != null){
-			if(StringUtils.isNotBlank(enterpriseDTO.getContactSecret()) && enterpriseDTO.getContactFlag() != null && enterpriseDTO.getContactFlag() == 0){
-				
-				log.info("【初始化部门调用】{},{},{}",RouterConstant.INIT_WX_DEPARTMENT_SERVICENAME,RouterConstant.INIT_WX_DEPARTMENT_METHODNAME,wxEnterpriseId);
-		        try {
-					GICMQClientUtil.getClientInstance().sendCommonMessage(RouterConstant.ROUTERTYPE, wxEnterpriseId,
-					 		RouterConstant.INIT_WX_DEPARTMENT_SERVICENAME, RouterConstant.INIT_WX_DEPARTMENT_METHODNAME);
-				} catch (Exception e) {
-					log.info(e.getMessage(),e);
-				}
-			}
-		}
-		
-		return resultResponse(HaoBanErrCode.ERR_1, true);
-		
-	}
 
 	@RequestMapping("cancal-suite")
 	@IgnoreLogin