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

@@ -450,11 +450,13 @@ public class StaffApiServiceImpl implements StaffApiService {
 						//if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(clerkDTO.getStaffName())){
 						String headPic = staffDTO.getHeadImg();
 						if(clerkDTO != null && (!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.getImageUrl())) 
+								|| !staffDTO.getSex().equals(clerkDTO.getClerkGender())){
 							logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
 							clerkDTO.setClerkName(staffDTO.getStaffName());
 							clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
 							clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
+							clerkDTO.setClerkGender(staffDTO.getSex().toString());
 							clerkService.updateClerk(clerkDTO);
 						}
 						//}

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

@@ -6,6 +6,8 @@ import java.util.Map;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.hutool.core.collection.CollectionUtil;
 
 import com.alibaba.druid.util.StringUtils;
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
@@ -46,6 +49,7 @@ import com.gic.wechat.token.api.service.QywxTokenManageService;
 
 @RestController
 public class WxEnterpriseController extends WebBaseController{
+	private static Logger logger  = LoggerFactory.getLogger(WxEnterpriseController.class);
 	@Autowired
 	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
 	@Autowired
@@ -63,6 +67,7 @@ public class WxEnterpriseController extends WebBaseController{
 	@Autowired
 	private Config config;
 	
+	
 	//授权企业列表
 	@HttpLimit
 	@IgnoreLogin
@@ -115,6 +120,7 @@ public class WxEnterpriseController extends WebBaseController{
 		if(dto == null){
 			return resultResponse(HaoBanErrCode.ERR_10012);
 		}
+		logger.info("【企业同步】dto={}",JSON.toJSONString(dto));
 		WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, dto);
 		wxDTO.setWxEnterpriseId(wxEnterpriseId);
 		wxEnterpriseApiService.update(wxDTO);