Browse Source

修改报错提示

anderx 1 week ago
parent
commit
2dbb672f67

+ 4 - 1
kd-common/src/main/java/org/sky/common/constant/LauncherConstant.java

@@ -41,9 +41,12 @@ public interface LauncherConstant {
 	 * nacos test 地址
 	 */
 	String NACOS_TEST_ADDR = "172.18.238.53:8848";
-
 	String NACOS_TEST_NAMESPACE = "6a3a2b86-c938-4188-b1ff-cd5f909c6b6c";
 
+//  nacos本地化直接部署
+//	String NACOS_TEST_ADDR = "127.0.0.1:8848";
+//	String NACOS_TEST_NAMESPACE = "";
+
 	/**
 	 * sentinel dev 地址
 	 */

+ 0 - 1
kd-ops/kd-resource/src/main/java/org/sky/resource/rule/oss/MinioRule.java

@@ -38,7 +38,6 @@ public class MinioRule extends RuleComponent {
 			.credentials(oss.getAccessKey(), oss.getSecretKey())
 			.build();
 		OssTemplate ossTemplate = new MinioTemplate(minioClient, ossRule, ossProperties);
-
 		// 设置上下文
 		contextBean.setOssTemplate(ossTemplate);
 

+ 3 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/TechnicianServiceImpl.java

@@ -876,6 +876,9 @@ public class TechnicianServiceImpl extends BaseServiceImpl<TechnicianMapper, Tec
 		if (Func.isNotBlank(idCard)) {
 			builder.append("身份证[").append(idCard).append("]");
 		}
+		if (Func.isBlank(number)&&Func.isBlank(idCard)){
+			builder.append("工号与身份证都");
+		}
 		return builder.append("不存在").toString();
 	}
 

+ 0 - 3
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/YsZjtrfyServiceImpl.java

@@ -77,7 +77,6 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 //			.eq(YsZjtrfyEntity::getXmId, entity.getXmId())
 //			.eq(YsZjtrfyEntity::getWzmc, entity.getWzmc());
 //		List<YsZjtrfyEntity> list = baseMapper.selectList(ew);
-
 		return false;
 	}
 
@@ -128,13 +127,11 @@ public class YsZjtrfyServiceImpl extends BaseServiceImpl<YsZjtrfyMapper, YsZjtrf
 			YsZjtrfyEntity entity = new YsZjtrfyEntity();
 			entity.setXmId(xmId);
 			BeanUtil.copyProperties(excel, entity);
-
 			insertList.add(entity);
 			if (insertList.size() % batchCount == 0 && this.saveBatch(insertList)) {
 				insertList.clear();
 			}
 		}
-
 		if (Func.isNotEmpty(insertList)) {
 			this.saveBatch(insertList);
 		}