Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -84,7 +84,7 @@ auth:
   expire-in: 2592000
   login-url: /login.html
   logout-url: /auth/api/logout
-  session-timeout: 2592000
+  session-timeout: -1
   success-url: ''
   unauthorized-url: ''
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -347,6 +347,14 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         List<PaymentManagement> paymentManagementList = paymentManagement.getPaymentManagementList();
         if (!CollectionUtils.isEmpty(paymentManagementList)) {
             for (PaymentManagement paymentManagement1 : paymentManagementList) {
+                //关联的合同号加备注信息
+                ContractManagementInfo contractManagementInfo=ContractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                .eq("contract_no",paymentManagement1.getContractNo())
+                .eq("comp_id",paymentManagement1.getCompId()));
+                if (contractManagementInfo!=null){
+                    contractManagementInfo.setRemarks(paymentManagement.getRemarks());
+                    ContractManagementInfoService.updateById(contractManagementInfo);
+                }
                 paymentManagement1.setRemarks(paymentManagement.getRemarks());
                 this.updateById(paymentManagement1);
             }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -51,6 +51,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         pageView.put("startRecord", (qualityInspectionManagement.getCurrentPage() - 1)
                 * qualityInspectionManagement.getPageSize());
         //公司id
+        if(qualityInspectionManagement.getCompId() == null || qualityInspectionManagement.getCompId().isEmpty()){
+            qualityInspectionManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+        }
         pageView.put("compId",qualityInspectionManagement.getCompId());
         pageView.put("searchKeyWord",qualityInspectionManagement.getSearchKeyWord());
         pageView.put("pageSize",qualityInspectionManagement.getPageSize());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -597,6 +597,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
      */
     @Override
     public List<ContractManagementInfo> selectContractNoList(String compId, Integer flag) {
+        if(compId == null || compId.isEmpty()){
+            compId=AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId();
+        }
         List<ContractManagementInfo> temp = new ArrayList();
         //查所有合同编号
         if (flag == null) {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonCompany;
 import com.winsea.svc.base.base.service.ICommonCompanyService;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
@@ -55,6 +56,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         pageView.put("startRecord", (weighingManagement.getCurrentPage() - 1)
                 * weighingManagement.getPageSize());
         //公司id
+        if(weighingManagement.getCompId() == null || weighingManagement.getCompId().isEmpty()){
+            weighingManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+        }
         pageView.put("compId",weighingManagement.getCompId());
         pageView.put("searchKeyWord",weighingManagement.getSearchKeyWord());
         pageView.put("pageSize",weighingManagement.getPageSize());