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

platform-rest/src/main/java/com/platform/rest/controller/longyanpurchaseorder/LongYanPurchaseOrderController.java

@@ -64,7 +64,6 @@ public class LongYanPurchaseOrderController {
    */
   @SysLog("新增龙岩采购单表")
   @PostMapping
-  @PreAuthorize("@pms.hasPermission('longyanpurchaseorder-menu-add')")
   public R save(@Validated({AddGroup.class}) @RequestBody LongYanPurchaseOrderDTO longYanPurchaseOrderDTO) {
       return new R<>(longYanPurchaseOrderService.saveModelByDTO(longYanPurchaseOrderDTO));
   }

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -233,7 +233,7 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
                 }
             }
             if (!flag){
-                throw new BusinessException("对不起，您没有请购权限！");
+                throw new BusinessException("您的账号，不是请购人！");
             }
 
 

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -235,7 +235,7 @@ public class YongyouServiceImpl implements YongyouService {
     }
     private String getConn2(Integer type) {
         boolean isDev = BeanUtils.isDev();
-        if(isDev){
+        if(!isDev){
             if (type == 1) { // 新厂
                 return RedisUtils.getString(Conn_key1);
             }else if (type == 2){
@@ -253,7 +253,7 @@ public class YongyouServiceImpl implements YongyouService {
 
     private String getCAccId2(Integer type) {
         boolean isDev = BeanUtils.isDev();
-        if(isDev){
+        if(!isDev){
             if (type == 1) {
                 return RedisUtils.getString(cAcc_ID_key1);
             } else if (type == 2) {
@@ -288,10 +288,15 @@ public class YongyouServiceImpl implements YongyouService {
         GetCurrentStockRequest req = new GetCurrentStockRequest();
         req.setToken(geToken(record.getTokenType()));
         req.setConn(getConn2(record.getTokenType()));
-        if (record.getTokenType()==1){
-            req.setCAcc_ID("005");
-        }else if (record.getTokenType()==2){
-            req.setCAcc_ID("004");
+        boolean isDev = BeanUtils.isDev();
+        if(!isDev){
+            if (record.getTokenType()==1){
+                req.setCAcc_ID("005");
+            }else if (record.getTokenType()==2){
+                req.setCAcc_ID("004");
+            }
+        }else{
+            req.setCAcc_ID("993");
         }
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
@@ -402,10 +407,15 @@ public class YongyouServiceImpl implements YongyouService {
         GetCurrentStockRequest req = new GetCurrentStockRequest();
         req.setToken(geToken(record.getTokenType()));
         req.setConn(getConn2(record.getTokenType()));
-        if (record.getTokenType()==1){
-            req.setCAcc_ID("005");
-        }else if (record.getTokenType()==2){
-            req.setCAcc_ID("004");
+        boolean isDev = BeanUtils.isDev();
+        if(!isDev){
+            if (record.getTokenType()==1){
+                req.setCAcc_ID("005");
+            }else if (record.getTokenType()==2){
+                req.setCAcc_ID("004");
+            }
+        }else{
+            req.setCAcc_ID("993");
         }
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);