Merge branch 'zcwy-master' into zcwy0912

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java

@@ -858,8 +858,8 @@ public class CasesServiceImpl implements ICasesService {
     }
 
     @Override
+    @Transactional
     public void save(Cases cases) {
-
         cases.setId(IDGenerator.generate());
         cases.setIsTop(false);
         cases.setComments(0);
@@ -887,6 +887,7 @@ public class CasesServiceImpl implements ICasesService {
     }
 
     @Override
+    @Transactional
     public void update(Cases cases) {
         List<String> majorIds = cases.getMajorIds();
         List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", cases.getId()));

servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import cn.hutool.core.util.DesensitizedUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -176,7 +177,10 @@ public class UserApi extends ApiBaseController {
             User u = service.get(account.getId());
             user = new UserVo();
             BeanUtils.copyProperties(u, user);
+            user.setMobileNo(DesensitizedUtil.mobilePhone(user.getMobileNo()));
             user.setIdNumber("");//去掉返回的用户身份证号信息
+            account.setEmail(DesensitizedUtil.email(account.getEmail()));
+            account.setMobile(DesensitizedUtil.mobilePhone(account.getMobile()));
             user.setAccount(account);
             user.setSign(u.getSign());
             user.setDynamic(u.getDynamic());