fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -77,4 +77,6 @@ public interface StaffApiService {
 	 * @return
 	 */
 	public ServiceResponse<String> getStaffQrcode(String clerkCode, String storeId);
+
+	void wxFristAdd(String userJson, String wxEnterpriseId);
 }

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

@@ -393,6 +393,98 @@ public class StaffApiServiceImpl implements StaffApiService {
 			}
 		}
 	}
+	
+	
+	@Override
+	public void wxFristAdd(String userJson,String wxEnterpriseId) {
+		if(StringUtils.isBlank(userJson)){
+			return;
+		}
+		UserDTO user = JSON.parseObject(userJson,UserDTO.class);
+		//获取微信用户信息
+		String userId = user.getUserid();
+		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId,wxEnterpriseId);
+		if(staff == null) {
+			WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+			if(enterpriseDTO != null) {
+				Date now = new Date();
+				//UserDTO user = qywxUserApiService.getSelfWorkWxUser(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), userId);
+				logger.info("【新增用户】user={}",JSON.toJSONString(user));
+				TabHaobanStaff tab = new TabHaobanStaff();
+				tab.setWxUserId(userId);
+				tab.setCreateTime(now);
+				tab.setUpdateTime(now);
+				tab.setStatusFlag(1);
+				tab.setWxEnterpriseId(wxEnterpriseId);
+				if(StringUtils.isNotBlank(user.getAvatar())){
+					tab.setHeadImg(changeHeaderImageUrl(user.getAvatar()));
+				}
+				tab.setPhoneNumber(user.getMobile());
+                if (StringUtils.isNotBlank(user.getName())) {
+                    user.setName(EmojiParser.removeAllEmojis(user.getName()));
+                    tab.setStaffName((user.getName()));
+                }
+                if (StringUtils.isNotBlank(user.getAlias())) {
+                    user.setAlias(EmojiParser.removeAllEmojis(user.getAlias()));
+                    tab.setNickName((user.getAlias()));
+                }
+//					tab.setNickName(user.getAlias());
+                tab.setNationCode("86");
+				tab.setSex(user.getGender() == null ? 1:Integer.parseInt(user.getGender()));
+				tab.setActiveFlag(1);
+				tab.setPostion(user.getPosition());
+				tab.setExtendPostion(user.getExternal_position());
+				if(user.getStatus() != null && user.getStatus() == 1){
+					tab.setActiveFlag(1);
+	            } else {
+	            	tab.setActiveFlag(0);
+	            }
+				String staffId = staffService.add(tab);
+				
+				Integer[] departmentId = user.getDepartment();
+				for (Integer integer : departmentId) {
+					TabHaobanDepartment tabDepartment = departmentService.getByWxId(integer.toString(), wxEnterpriseId);
+					if(tabDepartment != null){
+						TabHaobanStaffDepartmentRelated tabStaff = staffDepartmentRelatedService.getDepartmentIdAndStaffId(tabDepartment.getDepartmentId(), tab.getStaffId());
+						if(tabStaff == null){
+							StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
+							dto.setPhoneNumber(user.getMobile());
+							dto.setWxUserId(userId);
+							dto.setStaffId(staffId);
+							dto.setStaffName(user.getName());
+							dto.setWxEnterpriseId(wxEnterpriseId);
+							dto.setStatusFlag(1);
+							dto.setDepartmentId(tabDepartment.getDepartmentId());
+							dto.setNationCode("86");
+							dto.setStaffName(user.getName());
+							staffDepartmentRelatedService.add(dto);
+						}
+					}
+				}
+			}
+		}else{
+			WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
+			if(enterpriseDTO != null) {
+				//UserDTO user = qywxUserApiService.getSelfWorkWxUser(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), userId);
+				logger.info("【修改用户】user={}",JSON.toJSONString(user));
+				Integer[] departmentId = user.getDepartment();
+				String departmentIds = "";
+				for (Integer integer : departmentId) {
+					TabHaobanDepartment tabDepartment = departmentService.getByWxId(integer.toString(), wxEnterpriseId);
+					if(tabDepartment != null){
+						departmentIds += tabDepartment.getDepartmentId() + ",";
+					}
+				}
+				if(StringUtils.isNotBlank(departmentIds)){
+					departmentIds = departmentIds.substring(0,departmentIds.length() - 1);
+				}
+				StaffDTO staffDTO = EntityUtil.changeEntityByJSON(StaffDTO.class, staff);
+				staffDTO.setWeixinPush(true);
+				this.staffEdit(staffDTO, departmentIds);
+				//String staffId = staffService.add(tab);
+			}
+		}
+	}
 
     private void staffEditDeal(StaffDTO staffDTO, String departmentIds, boolean syncGic) {
         TabHaobanStaff oldStaff = staffMapper.selectByPrimaryKey(staffDTO.getStaffId());

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

@@ -73,7 +73,7 @@ public class LoginController extends WebBaseController{
 		
 		if(loginStaff == null){
 			if(enterprise != null){
-				staffApiService.wxGetAdd(user.getUserid(),enterprise.getWxEnterpriseId());
+				staffApiService.wxFristAdd(JSON.toJSONString(user),enterprise.getWxEnterpriseId());
 				loginStaff = staffApiService.selectByUserIdAndEnterpriseId(user.getUserid(),enterprise.getWxEnterpriseId());
 			}
 		}