hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-08 10:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy-master' into zcwy0912

Browse Source
This commit is contained in:
joshen@zcwytd.com
2023-10-26 09:53:00 +08:00
parent 4d634bae2f 85c87d4c3d
commit 6a1b42d2cd
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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