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

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/dto/InventoryDTO.java

@@ -53,7 +53,7 @@ public class InventoryDTO {
                 Object pi_hao_ = data.get("pi_hao_");
                 Object gui_ge_ = data.get("gui_ge_");
                 Object dao_huo_ri_qi_ = data.get("dao_huo_ri_qi_");
-                Object state = data.get("state");
+                Object status = data.get("status");
 
 //                Object createTime = data.get("createTime");
                 if(expDate !=null){
@@ -106,8 +106,8 @@ public class InventoryDTO {
                 if (dao_huo_ri_qi_ != null){
                     iv.getInventory().setArrivalDate(dao_huo_ri_qi_.toString());
                 }
-                if (state != null){
-                    iv.getInventory().setStatus(state.toString());
+                if (status != null){
+                    iv.getInventory().setStatus(status.toString());
                 }
                 iv.getTransaction().setType((Long)data.get("type_"));
                 list.add(iv);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/OrderService.java

@@ -102,7 +102,7 @@ public class OrderService extends GenericProvider {
             double currentDaiRuKu = getDoubleValue(orderSub.get("dai_ru_ku_shu_lia"));
             double orderQty = getDoubleValue(orderSub.get("shu_liang_")); // 订单总量，start时用
 
-            if (inQty <= 0) {
+            if (inQty < 0) {
                 return "-1^数量必须为正数 (当前值:" + inQty + ")";
             }
 

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/reagent/service/StoreService.java

@@ -29,7 +29,7 @@ public class StoreService implements OperationService {
         List<Map<String,Object>> query = (List<Map<String,Object>>)commonDao.query(
                 "SELECT c.xiao_qi_ expDate,c.bian_ma_ reagentCode,c.shu_liang_ quantity,c.id_ boId,1 as type_," +
                 " p.bian_zhi_ren_ createBy,p.bian_zhi_shi_jian createTime,p.di_dian_ diDian,p.bian_zhi_bu_men_,  " +
-                " c.zhuang_tai_ state, "+ //入库子表增加状态字段返回
+                " c.zhuang_tai_ status, "+ //入库子表增加状态字段返回
                 " c.zui_di_ku_cun_,c.cang_ku_,c.pi_hao_,c.gui_ge_,c.dao_huo_ri_qi_ FROM t_sjhxhclrkysdjb p, t_sjhxhclrkysdjbzb c " +
                 " WHERE p.id_=c.parent_id_ AND c.yan_shou_jie_guo_='合格' and p.id_=#{p0}", new String[]{id});
         return InventoryDTO.build(query);

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/common/provider/NewsProvider.java

@@ -1,6 +1,7 @@
 package com.lc.ibps.common.provider;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -131,11 +132,16 @@ public class NewsProvider extends GenericProvider implements INewsService, INews
 			@RequestBody(required = true) NewsPo newsPo) { // 保持原有参数不变
 
 		APIResult<Void> result = new APIResult<>();
-		boolean hasScope = true;
 		List<String> scopeUserIds = null;
 		try {
 			scopeUserIds = newsPo.getScopeUserIds();
-			hasScope = scopeUserIds != null;
+
+			//判断表是否存在,存在时如果没传scopeUserIds则设成空数组
+			boolean isTableExists = newsRepository.isTableExists("t_ggfwb");
+			if (isTableExists && scopeUserIds == null) {
+				scopeUserIds = new ArrayList<>();
+			}
+
 
 			if(StringUtils.isNotEmpty(newsPo.getId())){
 				APIResult<NewsPo> newsPoAPIResult = get(newsPo.getId());
@@ -155,7 +161,7 @@ public class NewsProvider extends GenericProvider implements INewsService, INews
 			result.setMessage(I18nUtil.getMessage("com.lc.ibps.common.provider.NewsProvider.save"));
 			result.addVariable("id", newsId);
 			//使用 scopeUserIds 做业务逻辑
-			if (hasScope == true && scopeUserIds != null && newsRepository.isTableExists("t_ggfwb")) {
+			if (scopeUserIds != null && isTableExists) {
 				//暂定newsType为user,后期可扩展(user=用户, dept=部门, role=角色')
 				newsService.saveNewsScope("user", scopeUserIds,newsId);
 			}