文件去掉双引号

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/delivery/DeliveryServiceImpl.java

@@ -112,7 +112,6 @@ public class DeliveryServiceImpl implements DeliveryService {
                     dwxxService.updateDwxx(createReqVO.getDwxxReqVO());
                 } else {
                     log.info("该单位信息已经存在,并且是从其他方法导入，{}", tyxydm1);
-//                    return null;
                 }
             }
             ///--------库区信息-------------////////////////////////////////////////////////////////

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -81,6 +81,7 @@ import static com.unis.module.infra.enums.ErrorCodeConstants.ERROR;
 @Validated
 public class DwxxServiceImpl implements DwxxService {
 
+    private static final String ALL_AREA_LEVEL_KEY = "all_area_levels";
     @Resource
     private DwxxMapper dwxxMapper;
     @Resource
@@ -116,8 +117,6 @@ public class DwxxServiceImpl implements DwxxService {
     @Resource
     private RedisTemplate<String, Object> redisTemplate;
 
-    private static final String ALL_AREA_LEVEL_KEY = "all_area_levels";
-
     @Override
     public Long createDwxx(DwxxSaveReqVO createReqVO) {
 
@@ -143,6 +142,12 @@ public class DwxxServiceImpl implements DwxxService {
             throw exception(DWXX_LOGIN_USER_EXISTS);
         }
 
+        String str = dwxx.getResid();
+        if (str != null && str.startsWith("[") && str.endsWith("]")) {
+            str = str.substring(1, str.length() - 1);
+        }
+        dwxx.setResid(str);
+
         dwxxMapper.insert(dwxx);
         // 返回
         return dwxx.getId();
@@ -155,6 +160,12 @@ public class DwxxServiceImpl implements DwxxService {
         validateDwxxExists(updateReqVO.getId());
         // 更新
         DwxxDO updateObj = BeanUtils.toBean(updateReqVO, DwxxDO.class);
+
+        String str = updateObj.getResid();
+        if (str != null && str.startsWith("[") && str.endsWith("]")) {
+            str = str.substring(1, str.length() - 1);
+        }
+        updateObj.setResid(str);
         dwxxMapper.updateById(updateObj);
     }
 
@@ -211,7 +222,7 @@ public class DwxxServiceImpl implements DwxxService {
             }
 
             // 检查角色ID字符串中是否包含银行管理员角色ID
-            if (roleIds != null && roleIds.contains(RoleIdEnum.BANK_ADMIN.getRoleId())){
+            if (roleIds != null && roleIds.contains(RoleIdEnum.BANK_ADMIN.getRoleId())) {
                 // 若包含银行管理员角色ID，从登录用户信息中获取银行类型
                 String bankType = loginUser.getInfo().get("bankType");
                 // 检查银行类型是否为空
@@ -249,10 +260,10 @@ public class DwxxServiceImpl implements DwxxService {
             List<DeliveryRespVO> records = page.getRecords();
             if (!ObjectUtils.isEmpty(records)) {
                 records.stream().forEach(s -> {
-                     s.setCflx(pageReqVO.getCflx());
-                     s.setCfzt(pageReqVO.getCfzt());
-                     s.setCfEnd(pageReqVO.getCfEnd());
-                     s.setCfStart(pageReqVO.getCfStart());
+                    s.setCflx(pageReqVO.getCflx());
+                    s.setCfzt(pageReqVO.getCfzt());
+                    s.setCfEnd(pageReqVO.getCfEnd());
+                    s.setCfStart(pageReqVO.getCfStart());
                     if (Arrays.asList(CityConstants.CITY).contains(s.getSheng()) && ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) && roleIds != null && !roleIds.contains(RoleIdEnum.BANK_ADMIN.getRoleId())) {
                         s.setShi(s.getXian());
                         s.setXian(null);
@@ -313,8 +324,8 @@ public class DwxxServiceImpl implements DwxxService {
         } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
             List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
             if (!ObjectUtils.isEmpty(caxxDOS)) {
-                caxxDOS.stream().forEach(s->{
-                    if (s.getSjcr()!=null) {
+                caxxDOS.stream().forEach(s -> {
+                    if (s.getSjcr() != null) {
                         BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
                         s.setSjcr(truncatedNumber);
                     }
@@ -337,7 +348,7 @@ public class DwxxServiceImpl implements DwxxService {
         if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
             pageReqVO.setType(1);
             storeListForBank = provinceMapper.getStoreListForProvince(pageReqVO);
-            List<StoreRespVO> storeListSelelct = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
+            List<StoreRespVO> storeListSelelct = bankMapper.getStoreListForBank(pageReqVO.getKqId(), bankType);
             if (!ObjectUtils.isEmpty(storeListForBank)) {
                 if (!ObjectUtils.isEmpty(storeListSelelct)) {
                     List<Long> idsExist = storeListSelelct.stream().map(StoreRespVO::getId).collect(Collectors.toList());
@@ -347,11 +358,11 @@ public class DwxxServiceImpl implements DwxxService {
                 }
             }
         } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
-            storeListForBank = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
+            storeListForBank = bankMapper.getStoreListForBank(pageReqVO.getKqId(), bankType);
         } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
             storeListForBank = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), bankType);
         } else if (YXZT.SELECT.getCode().equals(pageReqVO.getYxcf())) {
-            storeListForBank= caxxMapper.selectListForSelect(pageReqVO.getKqId(), bankType);
+            storeListForBank = caxxMapper.selectListForSelect(pageReqVO.getKqId(), bankType);
         }
         return storeListForBank;
     }
@@ -369,8 +380,8 @@ public class DwxxServiceImpl implements DwxxService {
                     }
                 }
                 if (!ObjectUtils.isEmpty(caxxDOS)) {
-                    caxxDOS.stream().forEach(s->{
-                        if (s.getSjcr()!=null) {
+                    caxxDOS.stream().forEach(s -> {
+                        if (s.getSjcr() != null) {
                             BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
                             s.setSjcr(truncatedNumber);
                         }
@@ -763,7 +774,7 @@ public class DwxxServiceImpl implements DwxxService {
                             if (parts[2] == null || parts[2].isEmpty()) {
                                 city = parts[1];
                             }
-                        }else {
+                        } else {
                             city = parts[1];
                             county = parts[2];
                         }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/kqxx/KqxxServiceImpl.java

@@ -8,11 +8,14 @@ import com.github.yitter.idgen.YitIdHelper;
 import com.unis.framework.security.core.LoginUser;
 import com.unis.framework.security.core.util.SecurityFrameworkUtils;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+
 import com.unis.module.coding.controller.admin.kqxx.vo.*;
 import com.unis.module.coding.dal.dataobject.kqxx.KqxxDO;
 import com.unis.framework.common.pojo.PageResult;
@@ -43,6 +46,13 @@ public class KqxxServiceImpl implements KqxxService {
         KqxxDO kqxx = BeanUtils.toBean(createReqVO, KqxxDO.class);
         kqxx.setId(YitIdHelper.nextId());
         kqxx.setSjly(0);
+
+        String str = kqxx.getResid();
+        if (str != null && str.startsWith("[") && str.endsWith("]")) {
+            str = str.substring(1, str.length() - 1);
+        }
+        kqxx.setResid(str);
+
         kqxxMapper.insert(kqxx);
         // 返回
         return kqxx.getId();
@@ -92,7 +102,7 @@ public class KqxxServiceImpl implements KqxxService {
             throw exception(ERROR, "当前用户不存在库区编码");
         }
         List<KqxxDO> KqxxDO = kqxxMapper.selectList(new QueryWrapper<KqxxDO>().eq("KQBM", kqbm));
-        if(CollectionUtils.isEmpty(KqxxDO)){
+        if (CollectionUtils.isEmpty(KqxxDO)) {
             throw exception(ERROR, "当前库区编码下无库区信息");
         }
         return KqxxDO.get(0);