Merge branch 'release-201816-wangcz'

.gitignore

@@ -60,5 +60,8 @@ buildNumber.properties
 # /src/test/
 /src/test/java/com/uas/platform/b2c/RegistForMall.java
 /src/test/java/com/uas/platform/b2c/testForRestTemplate.java
-/.gitignore
 /src/test/java/com/uas/platform/b2c/testAaa.java
+/src/main/java/com/uas/platform/b2c/fa/payment/dao/AssociatorSubAccountDao.java
+/src/main/java/com/uas/platform/b2c/fa/payment/model/AssociatorSubAccount.java
+/.gitignore
+!/.gitignore

src/main/java/com/uas/platform/b2c/advertise/ad/service/impl/RecommendProductServiceImpl.java

@@ -7,6 +7,7 @@ import com.uas.platform.b2c.advertise.ad.utils.RecommendProductsUtils;
 import com.uas.platform.b2c.core.config.MicroServicesConfMulti;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.core.KafkaTemplate;
@@ -101,23 +102,25 @@ public class RecommendProductServiceImpl implements RecommendProductService {
 		if (CollectionUtils.isEmpty(productList)) {
 			return Collections.emptyList();
 		}
-
+		List<RecommendProduct> list = new ArrayList<>();
 		for (RecommendProduct product : productList) {
+			RecommendProduct recommendProduct = new RecommendProduct();
+			BeanUtils.copyProperties(product, recommendProduct);
 			Date nowDate = new Date();
-
-			product.setStoreUuid(uuid);
-			product.setCreateTime(nowDate);
-			product.setUpdateTime(nowDate);
+			recommendProduct.setId(null);
+			recommendProduct.setStoreUuid(uuid);
+			recommendProduct.setCreateTime(nowDate);
+			recommendProduct.setUpdateTime(nowDate);
 		}
-		recommendProductDao.save(productList);
+		List<RecommendProduct> recommendProducts = recommendProductDao.save(list);
 
-		for (RecommendProduct product : productList) {
+		for (RecommendProduct product : recommendProducts) {
 			Goods commodity = goodsDao.findByBatchCode(product.getBatchCode());
 			if (commodity != null) {
 				RecommendProductsUtils.fillCommodityInfo(product, commodity);
 			}
 		}
-		return productList;
+		return recommendProducts;
 	}
 
 

src/main/java/com/uas/platform/b2c/common/account/model/User.java

@@ -203,7 +203,7 @@ public class User implements Serializable {
 	/**
 	 * 身份审核不通过备注
 	 */
-	@Column(name = "user_idRemarks")
+	@Column(name = "user_id_remarks")
 	private String idRemarks;
 
 

src/main/java/com/uas/platform/b2c/fa/payment/service/impl/InstallmentServiceImpl.java

@@ -282,7 +282,9 @@ public class InstallmentServiceImpl implements InstallmentService{
         if (NumberUtil.compare(total, installTotal) == 1) {
             InstallmentDetail installmentDetail = installmentDetailDao.findByInstallmentIdAndDetno(installment.getId(), installment.getCount().shortValue());
             if (installmentDetail != null) {
-                installmentDetail.setPrice(NumberUtil.pricesScaleTwo(total - installTotal + installmentDetail.getPrice()));
+                double rest1 = NumberUtil.sub(total, installTotal);
+                double result = NumberUtil.add(rest1, installmentDetail.getPrice());
+                installmentDetail.setPrice(NumberUtil.pricesScaleTwo(result));
                 installmentDetailDao.save(installmentDetail);
             }
         }

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ReleaseProductByBatchDao.java

@@ -79,9 +79,19 @@ public interface ReleaseProductByBatchDao
      * @param publisherUu the publisher uu 发布人
      * @param batchid     the batchid 批次号
      */
-    @Procedure(procedureName = "PRODUCT_RELEASE_VALID_V2")
+    @Procedure(procedureName = "PRODUCT_RELEASE_VALID_V3")
 	public void callValidProcedure(Long publisherUu, String batchid);
 
+
+	/**
+	 * 批量上架验证数据信息是否重复
+	 * @param batch 本批次代码
+	 * @param isPersonal 是否是个人
+	 * @param enuu 公司enuu
+	 */
+	@Procedure(procedureName = "PRODUCT_RELEASE_EXIST_VALID_V1")
+	void callReleaseExistValidProcedure(String batch, Boolean isPersonal, Long enuu);
+
 	/**
 	 * 验证器件和品牌的信息pcb
 	 * @param publisherUu

src/main/java/com/uas/platform/b2c/prod/commodity/model/Product.java

@@ -19,8 +19,8 @@ import java.util.Set;
 	@Index(name = "products_enuu_index", columnList = "pr_enuu"),
 	@Index(name = "products_cmpcode_index", columnList = "pr_cmpcode"),
 	@Index(name = "products_brand_index", columnList = "pr_brand"),
-	@Index(name = "products_enuu_code_index", columnList = "pr_code, pr_enuu", unique = true),
-	@Index(name = "products_enuu_standard_index", columnList = "pr_enuu, pr_standard"),
+	@Index(name = "products_enuu_code_index", columnList = "pr_enuu,pr_code", unique = true),
+	@Index(name = "products_enuu_standard_index", columnList = "pr_enuu,pr_standard"),
 	@Index(name = "products_erpdown_index", columnList = "pr_erpdown")})
 @Logger
 //@Cacheable

src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -542,6 +542,12 @@ public class ReleaseProductByBatch implements Serializable {
 	@Column(name = "rel_spec")
 	private String spec;
 
+	/**
+	 * 物料id信息
+	 */
+	@Column(name = "rel_productid")
+	private Long productid;
+
 	/**
 	 * 规格书信息
 	 */
@@ -1823,4 +1829,13 @@ public class ReleaseProductByBatch implements Serializable {
 		this.goodsCount = goodsCount;
 		return this;
 	}
+
+	public Long getProductid() {
+		return productid;
+	}
+
+	public ReleaseProductByBatch setProductid(Long productid) {
+		this.productid = productid;
+		return this;
+	}
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -243,44 +243,36 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 						releaseProductByBatch.setErrmsg(releaseProductByBatch.getErrmsg().substring(1));
 						releaseProductByBatch.setReleaseCode(ReleaseStatus.lack_info.value());
 						releaseProductByBatch.setReleaseStatus(ReleaseStatus.lack_info.getPhrase());
-					} else {
-						// 导入成功的需要判断自定义标签是否重复
-						if (!CollectionUtils.isEmpty(releaseProductByBatchs) && releaseProductByBatch.getTag() != null) {
-							if (validateTagInfo(releaseProductByBatch, releaseProductByBatchs)) {
-								releaseProductByBatch.setTag(null);
-							}
-						}
-						validateRepeatInExcel(releaseProductByBatchs, releaseProductByBatch, isImport);
 					}
-					// 简单验证数据，防止空行保存的情况
-					if (blankNum != 3) {
+					// 简单验证数据，防止空行保存的情况(品牌、类目、型号、库存量)
+					if (blankNum != 4) {
 						total++;
 						releaseProductByBatchs.add(releaseProductByBatch);
 					}
 				}
 			}
 		}
+
 		Long userUU = SystemSession.getUser().getUserUU();
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		List<ReleaseProductByBatch> addList = new ArrayList<>(releaseProductByBatchs.size());
 		addList.addAll(releaseProductByBatchs);
-		resetRepeatData(addList, isImport, isAPerson);
+        commonDao.save(addList, ReleaseProductByBatch.class);
+        releaseProductByBatchDao.callReleaseExistValidProcedure(batch, isAPerson, enUU);
 		if (isAPerson) {
 			for (ReleaseProductByBatch releaseProductByBatch : addList) {
-				List<Product> productList = productDao.findByEnUUAndPcmpcodeAndPbrandenAndB2cEnabled(enUU,releaseProductByBatch.getB2cCode(),
-						releaseProductByBatch.getB2cBranden(),IntegerConstant.YES_SHORT);
-				if (!CollectionUtils.isEmpty(productList)) {
-				    List<ProductPerson> productPersonList = productPersonDao.findByProductId(productList.get(0).getId());
-				    if (!CollectionUtils.isEmpty(productPersonList)) {
+                Long productid = releaseProductByBatch.getProductid();
+                if (productid != null) {
+                    List<ProductPerson> productPersonList = productPersonDao.findByProductId(productid);
+                    if (!CollectionUtils.isEmpty(productPersonList)) {
                         releaseProductByBatch.setErrmsg(ErrorInfoConstant.REPEAT_INFO.getInfo());
                         releaseProductByBatch.setReleaseCode(ReleaseStatus.had_exists.value());
                         releaseProductByBatch.setReleaseStatus(ReleaseStatus.had_exists.getPhrase());
                         total --;
                     }
-				}
+                }
 			}
 		}
-		commonDao.save(addList, ReleaseProductByBatch.class);
 
 		if (isPcb) {
 			releaseProductByBatchDao.callValidProcedurePcb(enUU, batch);
@@ -1721,7 +1713,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		}
 		Enterprise enterprise = SystemSession.getUser().getEnterprise();
 		final Object[] obj = new Object[]{enterprise.getUu(), enterprise.getEnName(), batch};
-		String sql = "/*#mycat:db_type=master*/ set @enuu = %s; set @enName = '%s'; set @batch = '%s'; call RELEASE_TO_GOODS_V2(@enuu, @enName, @batch, @out); select @out";
+		String sql = "/*#mycat:db_type=master*/ set @enuu = %s; set @enName = '%s'; set @batch = '%s'; call RELEASE_TO_GOODS_V3(@enuu, @enName, @batch, @out); select @out";
 		final String updateSql = String.format(sql, obj);
 		String num = jdbcTemplate.execute(new StatementCallback<String>() {
 

src/main/java/com/uas/platform/b2c/prod/store/controller/StoreInController.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.prod.store.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.advertise.ad.model.RecommendProduct;
 import com.uas.platform.b2c.advertise.ad.service.RecommendProductService;
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
@@ -128,8 +129,13 @@ public class StoreInController {
 	@RequestMapping(value = "/stores", method = RequestMethod.GET, params = "op=check")
 	public StoreIn existStore() {
 		logger.info("Find store by enUU");
-		Long enUU = SystemSession.getUser().getEnterprise().getUu();
-		return storeService.findByEnUU(enUU);
+		Enterprise enterprise = SystemSession.getUser().getEnterprise();
+		if (enterprise != null) {
+			Long enUU = enterprise.getUu();
+			return storeService.findByEnUU(enUU);
+		} else {
+			return null;
+		}
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderDetailServiceImpl.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.trade.order.service.impl;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.constant.Status;
+import com.uas.platform.b2c.core.constant.Type;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.NumberUtil;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
@@ -466,7 +467,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
 		User user = SystemSession.getUser();
 		assert user != null;
 		final Long userUU = user.getUserUU();
-		final Long enUU = user.getEnterprise().getUu();
+		final Long enUU = (user.getEnterprise() != null) ? user.getEnterprise().getUu() : null;
 
 		List<OrderDetail> detailList = orderDetailDao.findAll(new Specification<OrderDetail>() {
 			@Override
@@ -481,7 +482,12 @@ public class OrderDetailServiceImpl implements OrderDetailService {
 				// 当前用户订单明细筛选
 				CriterionExpression[] rootExpression = new CriterionExpression[3];
 				rootExpression[0] = new SimpleExpression("order.buyeruu", userUU, CriterionExpression.Operator.EQ);
-				rootExpression[1] = new SimpleExpression("order.buyerenuu", enUU, CriterionExpression.Operator.EQ);
+				if (enUU != null) {
+					rootExpression[1] = new SimpleExpression("order.buyerenuu", enUU, CriterionExpression.Operator.EQ);
+				} else {
+					rootExpression[1] = new SimpleExpression("order.dissociative", Type.PERSONAL.value(), CriterionExpression.Operator.EQ);
+				}
+
 				rootExpression[2] = logicalExpression;
 
 				logicalExpression = PredicateUtils.and(rootExpression);

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -1652,14 +1652,18 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public Order findOrderDetail(String orderid) {
         Order order = orderDao.findOrderByOrderid(orderid);
-        if (order.getBuyerenuu() != null && order.getBuyerentername() == null) {
-            Enterprise enterprise = enterpriseDao.findByUu(order.getBuyerenuu());
-            if (enterprise != null) {
-                order.setBuyerentername(enterprise.getEnName());
+        if (order != null) {
+            if (order.getBuyerenuu() != null && order.getBuyerentername() == null) {
+                Enterprise enterprise = enterpriseDao.findByUu(order.getBuyerenuu());
+                if (enterprise != null) {
+                    order.setBuyerentername(enterprise.getEnName());
+                }
             }
+            order.setReceiveName(sysConf.getEnName());
+            return order;
+        } else {
+            throw new IllegalOperatorException("找不到指定的订单");
         }
-        order.setReceiveName(sysConf.getEnName());
-        return order;
     }
 
     @Override

src/main/java/com/uas/platform/b2c/trade/rate/service/impl/RateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.trade.rate.service.impl;
 
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.core.constant.Status;
 import com.uas.platform.b2c.core.support.SystemSession;
@@ -62,7 +63,10 @@ public class RateServiceImpl implements RateService {
     @Override
     public RateVendor saveRateVendor(String orderId, RateVendor rateVendor) {
         rateVendor.setUserUU(SystemSession.getUser().getUserUU());
-        rateVendor.setUserEnuu(SystemSession.getUser().getEnterprise().getUu());
+        Enterprise enterprise = SystemSession.getUser().getEnterprise();
+        if (enterprise != null) {
+            rateVendor.setUserEnuu(enterprise.getUu());
+        }
         rateVendor.setOrderId(orderId);
         rateVendor.setTime(new Date(System.currentTimeMillis()));
 
@@ -78,7 +82,10 @@ public class RateServiceImpl implements RateService {
             // 默认匿名评价
             rateGoods.setIsAnony(rateGoods.getIsAnony() == null ? isAnony : rateGoods.getIsAnony());
             rateGoods.setUserUU(SystemSession.getUser().getUserUU());
-            rateGoods.setUserEnuu(SystemSession.getUser().getEnterprise().getUu());
+            Enterprise enterprise = SystemSession.getUser().getEnterprise();
+            if (enterprise != null) {
+                rateGoods.setUserEnuu(enterprise.getUu());
+            }
             rateGoods.setOrderId(orderId);
             rateGoods.setBuyerRateTime(new Date(System.currentTimeMillis()));
         }

src/main/java/com/uas/platform/b2c/trade/vendor/controller/VendorIntroductionController.java

@@ -131,7 +131,7 @@ public class VendorIntroductionController {
 	 * @return 企业信息
 	 */
 	@RequestMapping(value = "/vendor/recommend", method = RequestMethod.GET)
-	public org.springframework.data.domain.Page<Enterprise> getRecommendVendor(@PageableDefault(value = 10, sort = { "prodCount" }, direction = Sort.Direction.DESC) Pageable pageable) {
+	public org.springframework.data.domain.Page<Enterprise> getRecommendVendor(@PageableDefault(value = 20, sort = { "prodCount" }, direction = Sort.Direction.DESC) Pageable pageable) {
 		return vendorIntroductionService.getRecommendVendor(pageable);
 	}
 

src/main/java/com/uas/platform/b2c/trade/vendor/model/VendorIntroduction.java

@@ -78,9 +78,14 @@ public class VendorIntroduction {
     private Short isStore;
 
     /**
-     * 是否有有效物料
+     * 店铺logo Url
      */
-    private Short hasProduct;
+    private String storeLogoUrl;
+
+    /**
+     * 企业 logo Url
+     */
+    private String enLogoUrl;
 
     public String getProductInfo() {
         return productInfo;
@@ -194,11 +199,19 @@ public class VendorIntroduction {
         this.isStore = isStore;
     }
 
-    public Short getHasProduct() {
-        return hasProduct;
+    public String getStoreLogoUrl() {
+        return storeLogoUrl;
+    }
+
+    public void setStoreLogoUrl(String storeLogoUrl) {
+        this.storeLogoUrl = storeLogoUrl;
+    }
+
+    public String getEnLogoUrl() {
+        return enLogoUrl;
     }
 
-    public void setHasProduct(Short hasProduct) {
-        this.hasProduct = hasProduct;
+    public void setEnLogoUrl(String enLogoUrl) {
+        this.enLogoUrl = enLogoUrl;
     }
 }

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -9,6 +9,8 @@ import com.uas.platform.b2c.core.constant.IntegerConstant;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.commodity.dao.V_ProductPrivateDao;
 import com.uas.platform.b2c.prod.commodity.model.V_ProductPrivate;
+import com.uas.platform.b2c.prod.store.dao.StoreInDao;
+import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.b2c.trade.vendor.model.VendorIntroduction;
 import com.uas.platform.b2c.trade.vendor.service.VendorIntroductionService;
 import com.uas.ps.core.util.CollectionUtils;
@@ -39,6 +41,9 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
+	@Autowired
+	private StoreInDao storeInDao;
+
 	/**
 	 * 类目
 	 */
@@ -159,7 +164,15 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		if (pageable == null) {
 			return null;
 		}
-		return enterpriseDao.findAll(pageable);
+		org.springframework.data.domain.Page<Enterprise> enterprisePage = enterpriseDao.findAll(pageable);
+		for (Enterprise enterprise : enterprisePage.getContent()) {
+			List<StoreIn> stores = storeInDao.findByEnUU(enterprise.getUu());
+			if (!CollectionUtils.isEmpty(stores) && !StringUtils.isEmpty(stores.get(0).getLogoUrl())) {
+				// 此处仅方便前端展示
+				enterprise.setEnLogoUrl(stores.get(0).getLogoUrl());
+			}
+		}
+		return enterprisePage;
 	}
 
 	/**
@@ -176,7 +189,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		// 查询所有符合条件的enUU的语句，按待售物料数量排序
 		String enUUSql = getEnUUGroupByEnUUOrderByCount(enUU, enterpriseCondition, productCondition);
 		// 获取企业sql
-		enterpriseSql.append("select en.en_uu enUU, en.en_name enName, en.en_shortname enShortname, en.en_address enAddress, en.en_tel enTel, " +
+		enterpriseSql.append("select en.en_uu enUU, en.en_name enName, en.en_shortname enShortname, st.st_logo_url storeLogoUrl, en.en_logurl enLogoUrl, en.en_address enAddress, en.en_tel enTel, " +
 				" en.en_email enEmail, en.en_corporation enCorporation, en.en_businesscode enBusinesscode, en.en_industry enIndustry, en.en_Businessscope enBusinessScope " +
 				",st.st_uuid,st.st_status from sec$enterprises en left join store$info st on st.st_enuu = en.en_uu right join (").append(enUUSql)
 				.append(" ) a on en.en_uu = a.en_uu order by en.en_weight desc, counts desc");
@@ -202,7 +215,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	private List<VendorIntroduction> getEnterpriseWithoutProductCondition(Long enUU, String enterpriseCondition, int page, int size) {
 		StringBuilder enterpriseSql = new StringBuilder();
 		// 获取企业sql
-		enterpriseSql.append("select en.en_uu enUU, en.en_name enName, en.en_shortname enShortname, en.en_address enAddress, en.en_tel enTel, " +
+		enterpriseSql.append("select en.en_uu enUU, en.en_name enName, en.en_shortname enShortname, st.st_logo_url storeLogoUrl, en.en_logurl enLogoUrl, en.en_address enAddress, en.en_tel enTel, " +
 				"en.en_email enEmail, en.en_corporation enCorporation, en.en_businesscode enBusinesscode, en.en_industry enIndustry, en.en_Businessscope enBusinessScope " +
 				",st.st_enuu,st.st_status from sec$enterprises en left join store$info st on st.st_enuu = en.en_uu where en_name not like '%测试%' and en_name not like '%test%' " +
 				"and (length(en_businesscode) > 12 or en_name like '%香港%' or en_name like '%HONG KONG%' or en_area like '%香港%') and " +

src/main/resources/dev/jdbc.properties

@@ -8,4 +8,6 @@ jdbc.maxIdle=50
 jdbc.minIdle=1
 jdbc.suspectTimeout=60
 jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000
+jdbc.minEvictableIdleTimeMillis=60000
+jdbc.validationQuery=SELECT 1
+jdbc.testWhileIdle=true

src/main/resources/log4j.properties

@@ -8,7 +8,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p [%c]:%m%n
 
 log4j.appender.logfile=org.apache.log4j.RollingFileAppender
 log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-#log4j.appender.logfile.File=../log4j.log
+log4j.appender.logfile.File=../log4j.log
 #log4j.appender.logfile.File=$CATALINA_BASE/logs/b2c_log4j.log
 # Keep three backup files.
 log4j.appender.logfile.MaxBackupIndex=3

src/main/resources/prod/jdbc.properties

@@ -8,4 +8,6 @@ jdbc.maxIdle=50
 jdbc.minIdle=50
 jdbc.suspectTimeout=60
 jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000
+jdbc.minEvictableIdleTimeMillis=60000
+jdbc.validationQuery=SELECT 1
+jdbc.testWhileIdle=true

src/main/resources/spring/context.xml

@@ -112,7 +112,7 @@
 
 	<bean id="entityManagerFactory"
 		  class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<!--<property name="persistenceUnitName" value="persistenceUnit" />-->
+		<property name="persistenceUnitName" value="persistenceUnit" />
 		<property name="persistenceXmlLocation" value="classpath*:META-INF/persistence.xml"/>
 		<property name="packagesToScan" value="com.uas.platform" />
 		<property name="dataSource" ref="dataSource" />

src/main/resources/test/jdbc.properties

@@ -8,4 +8,6 @@ jdbc.maxIdle=50
 jdbc.minIdle=1
 jdbc.suspectTimeout=60
 jdbc.timeBetweenEvictionRunsMillis=30000
-jdbc.minEvictableIdleTimeMillis=60000
+jdbc.minEvictableIdleTimeMillis=60000
+jdbc.validationQuery=SELECT 1
+jdbc.testWhileIdle=true

src/main/webapp/resources/view/sso/staffManagement.html

@@ -1007,7 +1007,7 @@
                          </td>-->
                         <td>{{user.userUU}}</td>
                         <td>{{user.userName}}</td>
-                        <td>{{user.userSex == 'M'?'男':'女'}}</td>
+                        <td>{{user.userSex != null ? (user.userSex == 'M' || user.userSex == '男' ? '男' : '女') : '-'}}</td>
                         <td>{{user.userTel}}</td>
                         <td>{{user.userEmail}}</td>
                         <td class="role-tag-area detail-role-tag">