Commit 647ae98d authored by lisong's avatar lisong

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents b9c9cf98 6a9a074e
......@@ -84,7 +84,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserInfoDtoPage.getRecords().forEach(item -> {
if (!ObjectUtils.isEmpty(item.getProfile())) {
List<CommonFile> commonFiles = JSON.parseArray(item.getProfile(), CommonFile.class);
if (!ObjectUtils.isEmpty(commonFiles)){
if (!ObjectUtils.isEmpty(commonFiles)) {
item.setProfile(commonFiles.get(0).getUrl());
}
}
......@@ -262,7 +262,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
//绑定两个规定用户组
String post = tzsUserInfo.getPost();
post = post.replace("[","").replace("]","").replace("\"","");
post = post.replace("[", "").replace("]", "").replace("\"", "");
for (String code : post.split(",")) {
DataDictionary groupId = iDataDictionaryService
.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, code).likeRight(DataDictionary::getType, QYRYGW));
......@@ -333,10 +333,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Override
public Map<String, Object> getCompanyType() {
Map<String,Object> result = new HashMap<>();
Map<String, Object> result = new HashMap<>();
result.put("companyType", null);
List<CompanyModel> companyModels = FeignUtil.remoteCall(()->Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
if(companyModels.isEmpty()){
List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
if (companyModels.isEmpty()) {
return result;
}
result.put("creditCode", companyModels.get(0).getCompanyCode());
......@@ -344,31 +344,31 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
boolean useCompany = false;
for (CompanyModel companyModel : companyModels) {
String companyType = companyModel.getCompanyType();
if(companyType.contains("使用单位") || companyType.contains("个人主体")){
if (companyType.contains("使用单位") || companyType.contains("个人主体")) {
useCompany = true;
}
if(companyType.contains("充装单位") || companyType.contains("安装改造维修单位")||companyType.contains("制造单位") || companyType.contains("设计单位")){
if (companyType.contains("充装单位") || companyType.contains("安装改造维修单位") || companyType.contains("制造单位") || companyType.contains("设计单位")) {
productCompany = true;
}
}
String companyType = null;
if(useCompany){
if (useCompany) {
companyType = "use";
}
if(productCompany){
if (productCompany) {
companyType = "pro";
}
if(useCompany && productCompany){
if (useCompany && productCompany) {
companyType = "useAndPro";
}
result.put("companyType",companyType);
result.put("companyType", companyType);
return result;
}
@Override
public Page<TzsEquipListDto> getEquipList(String type,String userSeq,TzsEquipListDto dto, Page<TzsEquipListDto> page) {
List<CompanyModel> companyModels = FeignUtil.remoteCall(()->Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
if(companyModels.isEmpty()){
public Page<TzsEquipListDto> getEquipList(String type, String userSeq, TzsEquipListDto dto, Page<TzsEquipListDto> page) {
List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
if (companyModels.isEmpty()) {
throw new BadRequest("未指定人员归属单位信息");
}
String companyCode = companyModels.get(0).getCompanyCode();
......@@ -378,7 +378,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
}
@Override
public Boolean equipBind(String type, String userSeq,String creditCode, Map<String,Object> map) {
public Boolean equipBind(String type, String userSeq, String creditCode, Map<String, Object> map) {
Object recordList = map.get("ids");
List<String> ids = (List<String>) recordList;
List<TzsUserEquip> tzsUserEquipList = new ArrayList<>();
......@@ -392,7 +392,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
tzsUserEquipList.add(tzsUserEquip);
}
flag = tzsUserEquipService.saveBatch(tzsUserEquipList);
} else if("untie".equals(type)) {
} else if ("untie".equals(type)) {
int num = tzsUserEquipMapper.delete(new QueryWrapper<TzsUserEquip>().eq("user_seq", userSeq).in("equip_id", ids));
flag = num > 0 ? true : flag;
}
......@@ -401,7 +401,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Override
public List<TzsUserInfo> getSafetyList(String companyCode) {
return tzsUserInfoMapper.selectList(new QueryWrapper<TzsUserInfo>().eq("unit_code",companyCode).like("post",6549));
return tzsUserInfoMapper.selectList(new QueryWrapper<TzsUserInfo>().eq("unit_code", companyCode).like("post", 6549));
}
@Override
......
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