Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefinbank/BaseFinBank.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
  * File: BaseFinBank.java <br/>
@@ -25,13 +27,12 @@ import lombok.Data;
 public class BaseFinBank extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    
 	@ApiModelProperty("资方名称（陕汽必须字段）")
     private String manageName;
-    
 	@ApiModelProperty("联系人（陕汽必须字段）")
     private String name;
-    
 	@ApiModelProperty("联系电话（陕汽必须字段）")
     private String mobile;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefinbank/BaseFinBankDto.java

@@ -29,12 +29,13 @@ public class BaseFinBankDto implements Dto {
     @ApiModelProperty(value = "资方名称（陕汽必须字段）", required = true)
     @NotBlank(message = "资方名称不允许为空")
     private String manageName;
-
     @ApiModelProperty(value = "联系人（陕汽必须字段）", required = true)
     @NotBlank(message = "联系人不允许为空")
     private String name;
-
     @ApiModelProperty(value = "联系电话（陕汽必须字段）", required = true)
     @NotBlank(message = "联系电话不允许为空")
     private String mobile;
+    @ApiModelProperty(value = "创建组织sid", required = true)
+    @NotBlank(message = "创建组织不允许为空")
+    private String createOrgSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basefinbank/BaseFinBankQuery.java

@@ -23,13 +23,12 @@ import lombok.Data;
 @Data
 public class BaseFinBankQuery implements Query {
 
-    
 	@ApiModelProperty("资方名称（陕汽必须字段）")
     private String manageName;
-    
 	@ApiModelProperty("联系人（陕汽必须字段）")
     private String name;
-    
 	@ApiModelProperty("联系电话（陕汽必须字段）")
     private String mobile;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basefinbank/BaseFinBankService.java

@@ -54,19 +54,16 @@ public class BaseFinBankService extends MybatisBaseService<BaseFinBankMapper, Ba
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BaseFinBank> qw = new QueryWrapper<>();
-
-
         if (StringUtils.isNotBlank(query.getManageName())) {
             qw.like("manageName", query.getManageName());
         }
-
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("name", query.getName());
         }
-
         if (StringUtils.isNotBlank(query.getMobile())) {
             qw.like("mobile", query.getMobile());
         }
+        qw.eq("createOrgSid",query.getCreateOrgSid());
         return qw;
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -152,7 +152,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                     qw.eq("fp.useOrgSid", resultBean.getData());
                 }
             }
-
         }
         qw.orderByDesc("fp.createTime");
         IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -126,6 +126,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<ScmVehiclePatrolinspectionsheet> qw = new QueryWrapper<>();
+        qw.eq("createOrgSid",query.getCreateOrgSid());
         return qw;
     }
 

anrui-system-ui/src/views/Home/Home.vue

@@ -388,28 +388,28 @@ export default {
         let myPopup = window.open('/#/index', '_blank')
       } else if (index == '7') {
         // let myPopup = window.open('http://127.0.0.1:9531/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '8') {
         // let myPopup = window.open('http://127.0.0.1:9531/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '1') {
         // let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
         let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '4') {
         // let myPopup = window.open('http://127.0.0.1:9531/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '5') {
         // let myPopup = window.open('http://127.0.0.1:9531/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       } else if (index == '0') {
         // let myPopup = window.open('http://127.0.0.1:9531/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
-        // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank')
+        // let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage() + '&organizationData=' + encodeURI((JSON.stringify(organizationData))), '_blank')
       }
 //				const page = this.$router.resolve({name: name})
 //				window.open(page.href,'_blank')