Browse Source

修改材质管理

liaoyitao 2 months ago
parent
commit
90ca72f23f

+ 7 - 7
src/main/java/com/lqkj/link/module/authority/service/UserInfoService.java

@@ -139,13 +139,13 @@ public class UserInfoService {
139 139
             return "名称必须是2-8位中文字符!";
140 140
         }
141 141
 
142
-        // 授权码判断,8位数字、大写字母、小写字母
143
-        String auCodeRegex = "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8}$";
144
-        pattern = Pattern.compile(auCodeRegex);
145
-        matcher = pattern.matcher(userInfo.getAuthorizationCode());
146
-        if (!matcher.find()) {
147
-            return "授权码必须是8位数字、大写字母、小写字母!";
148
-        }
142
+//        // 授权码判断,8位数字、大写字母、小写字母
143
+//        String auCodeRegex = "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).{8}$";
144
+//        pattern = Pattern.compile(auCodeRegex);
145
+//        matcher = pattern.matcher(userInfo.getAuthorizationCode());
146
+//        if (!matcher.find()) {
147
+//            return "授权码必须是8位数字、大写字母、小写字母!";
148
+//        }
149 149
 
150 150
         if (userInfo.getUserId() == null) {
151 151
             // 重复判断

+ 3 - 1
src/main/java/com/lqkj/link/module/zone/service/impl/MaterialInfoServiceImpl.java

@@ -30,7 +30,9 @@ public class MaterialInfoServiceImpl implements MaterialInfoService {
30 30
     @Transactional
31 31
     @Override
32 32
     public void sava(MaterialInfo materialInfo) {
33
-        materialInfo.setMaterialName(StringUtils.split(materialInfo.getCompressFileName(), ".")[0]);
33
+        if (materialInfo.getCompressFileName() != null) {
34
+            materialInfo.setMaterialName(StringUtils.split(materialInfo.getCompressFileName(), ".")[0]);
35
+        }
34 36
         if ((Objects.nonNull(materialInfo.getMaterialId()) && materialInfoRepository.hasSameNameWithoutOne(materialInfo.getMaterialId(), materialInfo.getMaterialName()))
35 37
             || (Objects.isNull(materialInfo.getMaterialId()) && materialInfoRepository.hasSameName(materialInfo.getMaterialName()))) {
36 38
             throw new RuntimeException("材质名称不能重复!");