Commit dd9fcfdd by fudahua

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

parent 4e0caab3
......@@ -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>
......
......@@ -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());
......
......@@ -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);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment