Merge branch 'developer' into 'master'

emojo表情错误以及加入刷新接口

See merge request !23

haoban-manage3-service/pom.xml

@@ -55,8 +55,13 @@
             <version>${haoban-config}</version>
         </dependency>
         <dependency>
-        	<groupId>com.gic</groupId>
-        	<artifactId>haoban-manage3-api</artifactId>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>haoban-manage3-api</artifactId>
             <version>${haoban-manage3-api}</version>
         </dependency>
         <dependency>

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

@@ -12,6 +12,8 @@ import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.service.util.EmojiFilterUtil;
+import com.vdurmont.emoji.EmojiParser;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.hql.internal.CollectionSubqueryFactory;
@@ -311,9 +313,14 @@ public class StaffApiServiceImpl implements StaffApiService {
 					tab.setStatusFlag(1);
 					tab.setWxEnterpriseId(wxEnterpriseId);
 					tab.setPhoneNumber(user.getMobile());
-					tab.setStaffName(user.getName());
-					tab.setNickName(user.getAlias());
-					tab.setNationCode("86");
+                    if (StringUtils.isNotBlank(user.getName())) {
+                        tab.setStaffName(EmojiParser.removeAllEmojis(user.getName()));
+                    }
+                    if (StringUtils.isNotBlank(user.getAlias())) {
+                        tab.setNickName(EmojiParser.removeAllEmojis(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());

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

@@ -784,6 +784,14 @@ public class DepartmentContoller extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1);
 		
 	}
+
+	@RequestMapping("department-user-init")
+	public HaobanResponse departmentInit(String corpid, String suiteid, String wxEnterpriseId, Integer wxDepartmentId) {
+		RedisUtil.delCache("haoban-user-department-" + wxEnterpriseId);
+		staffApiService.initWxUser(corpid, suiteid, wxEnterpriseId, wxDepartmentId);
+		return resultResponse(HaoBanErrCode.ERR_1);
+
+	}
 	
 	
 }