Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java

@@ -30,4 +30,6 @@ public class ScmVehicleReturn extends BaseEntity {
     private String taskDefKey;
     @ApiModelProperty(value = "分公司名称")
     private String orgName;
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java

@@ -36,4 +36,6 @@ public class ScmVehicleReturnDetailsVo implements Vo {
     private String remarks;
     @ApiModelProperty(value = "分公司名称")
     private String orgName;
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java

@@ -64,4 +64,6 @@ public class ScmVehicleReturnDto implements Dto {
     private String createBySid;
     @ApiModelProperty(value = "分公司名称")
     private String orgName;
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java

@@ -53,4 +53,6 @@ public class ScmVehicleReturnFlowDto implements Serializable {
     private String taskDefKey;
     @ApiModelProperty(value = "分公司名称")
     private String orgName;
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java

@@ -24,5 +24,8 @@ public class ScmVehicleReturnQuery implements Query {
     @ApiModelProperty(value = "用户sid")
     private String userSid;
 
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
+
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java

@@ -29,4 +29,6 @@ public class ScmVehicleReturnVo implements Vo {
     private Integer num;
     @ApiModelProperty(value = "分公司名称")
     private String orgName;
+    @ApiModelProperty(value = "分公司sid")
+    private String createOrgSid;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -112,6 +112,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isNotBlank(query.getModelName())) {
             qw.like("modelName", query.getModelName());
         }
+        qw.eq("useOrgSid",query.getCreateOrgSid());
         return qw;
     }
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -178,6 +178,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             if (StringUtils.isNotBlank(params.getUserSid())) {
                 qw.eq("sr.createBySid", params.getUserSid());
             }
+            qw.eq("sr.createOrgSid",params.getCreateOrgSid());
         }
         IPage<ScmVehicleReturnVo> pagging = baseMapper.pagerList(page, qw);
         PagerVo<ScmVehicleReturnVo> p = PagerUtil.pageToVo(pagging, null);