系统收费商品分部

mec-biz/src/main/java/com/ym/mec/biz/dal/page/GoodsQueryInfo.java

@@ -29,22 +29,22 @@ public class GoodsQueryInfo extends QueryInfo {
     private Integer groupGoods;
 
     @ApiModelProperty(value = "客户端展示分部")
-    private String studentShowOrganId;
+    private Integer studentShowOrganId;
 
     @ApiModelProperty(value = "教务端展示分部")
-    private String educationShowOrganId;
+    private Integer educationShowOrganId;
 
     @ApiModelProperty(value = "乐团展示分部")
-    private String musicShowOrganId;
+    private Integer musicShowOrganId;
 
     @ApiModelProperty(value = "课程收费团展示分部")
-    private String courseFeeShowOrganId;
+    private Integer courseFeeShowOrganId;
 
     @ApiModelProperty(value = "会员收费团展示分部")
-    private String memberFeeShowOrganId;
+    private Integer memberFeeShowOrganId;
 
     @ApiModelProperty(value = "乐器置换展示分部")
-    private String replacementShowOrganId;
+    private Integer replacementShowOrganId;
 
     @ApiModelProperty(value = "分部")
     private String organId;
@@ -57,51 +57,51 @@ public class GoodsQueryInfo extends QueryInfo {
         this.organId = organId;
     }
 
-    public String getStudentShowOrganId() {
+    public Integer getStudentShowOrganId() {
         return studentShowOrganId;
     }
 
-    public void setStudentShowOrganId(String studentShowOrganId) {
+    public void setStudentShowOrganId(Integer studentShowOrganId) {
         this.studentShowOrganId = studentShowOrganId;
     }
 
-    public String getEducationShowOrganId() {
+    public Integer getEducationShowOrganId() {
         return educationShowOrganId;
     }
 
-    public void setEducationShowOrganId(String educationShowOrganId) {
+    public void setEducationShowOrganId(Integer educationShowOrganId) {
         this.educationShowOrganId = educationShowOrganId;
     }
 
-    public String getMusicShowOrganId() {
+    public Integer getMusicShowOrganId() {
         return musicShowOrganId;
     }
 
-    public void setMusicShowOrganId(String musicShowOrganId) {
+    public void setMusicShowOrganId(Integer musicShowOrganId) {
         this.musicShowOrganId = musicShowOrganId;
     }
 
-    public String getCourseFeeShowOrganId() {
+    public Integer getCourseFeeShowOrganId() {
         return courseFeeShowOrganId;
     }
 
-    public void setCourseFeeShowOrganId(String courseFeeShowOrganId) {
+    public void setCourseFeeShowOrganId(Integer courseFeeShowOrganId) {
         this.courseFeeShowOrganId = courseFeeShowOrganId;
     }
 
-    public String getMemberFeeShowOrganId() {
+    public Integer getMemberFeeShowOrganId() {
         return memberFeeShowOrganId;
     }
 
-    public void setMemberFeeShowOrganId(String memberFeeShowOrganId) {
+    public void setMemberFeeShowOrganId(Integer memberFeeShowOrganId) {
         this.memberFeeShowOrganId = memberFeeShowOrganId;
     }
 
-    public String getReplacementShowOrganId() {
+    public Integer getReplacementShowOrganId() {
         return replacementShowOrganId;
     }
 
-    public void setReplacementShowOrganId(String replacementShowOrganId) {
+    public void setReplacementShowOrganId(Integer replacementShowOrganId) {
         this.replacementShowOrganId = replacementShowOrganId;
     }
 

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -339,26 +339,27 @@
             <if test="groupGoods!=null and groupGoods==1">
                 AND g.complement_goods_id_list_ IS NOT NULL
             </if>
-            <if test="studentShowOrganId != null and studentShowOrganId != ''">
-                AND FIND_IN_SET(g.student_show_organ_id_,#{studentShowOrganId})
+            <if test="studentShowOrganId != null">
+                AND FIND_IN_SET(#{studentShowOrganId},g.student_show_organ_id_)
             </if>
-            <if test="educationShowOrganId != null and educationShowOrganId != ''">
-                AND FIND_IN_SET(g.education_show_organ_id_,#{educationShowOrganId})
+            <if test="educationShowOrganId != null">
+                AND FIND_IN_SET(#{educationShowOrganId},g.education_show_organ_id_)
             </if>
-            <if test="musicShowOrganId != null and musicShowOrganId != ''">
-                AND FIND_IN_SET(g.music_show_organ_id_,#{musicShowOrganId})
+            <if test="musicShowOrganId != null">
+                AND FIND_IN_SET(#{musicShowOrganId},g.music_show_organ_id_)
             </if>
-            <if test="courseFeeShowOrganId != null and courseFeeShowOrganId != ''">
-                AND FIND_IN_SET(g.course_fee_show_organ_id_,#{courseFeeShowOrganId})
+            <if test="courseFeeShowOrganId != null">
+                AND FIND_IN_SET(#{courseFeeShowOrganId},g.course_fee_show_organ_id_)
             </if>
-            <if test="memberFeeShowOrganId!=null and memberFeeShowOrganId != ''">
-                AND FIND_IN_SET(g.member_fee_show_organ_id_,#{memberFeeShowOrganId})
+            <if test="memberFeeShowOrganId!=null">
+                AND FIND_IN_SET(#{memberFeeShowOrganId},g.member_fee_show_organ_id_)
             </if>
-            <if test="replacementShowOrganId!=null and replacementShowOrganId != ''">
-                AND FIND_IN_SET(g.replacement_show_organ_id_,#{replacementShowOrganId})
+            <if test="replacementShowOrganId!=null">
+                AND FIND_IN_SET(#{replacementShowOrganId},g.replacement_show_organ_id_)
             </if>
             <if test="organId != null and organId != ''">
---                 AND FIND_IN_SET(g.replacement_show_organ_id_,#{replacementShowOrganId})
+                AND INTE_ARRAY (#{organId},CONCAT_WS(",",replacement_show_organ_id_,member_fee_show_organ_id_,
+                course_fee_show_organ_id_,music_show_organ_id_,education_show_organ_id_,student_show_organ_id_))
             </if>
             <if test="search!=null and search!=''">
                 AND (g.sn_=#{search} OR g.id_=#{search} OR g.name_ LIKE CONCAT('%', #{search}, '%'))

mec-student/src/main/java/com/ym/mec/student/controller/GoodsController.java

@@ -50,6 +50,11 @@ public class GoodsController extends BaseController {
     @ApiOperation(value = "分页查询商品(教材、辅件)列表")
     @GetMapping("/queryPage")
     public Object queryPage(GoodsQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请先登录");
+        }
+        queryInfo.setOrganId(sysUser.getOrganId().toString());
         return succeed(goodsService.queryPage(queryInfo));
     }
 

mec-student/src/main/java/com/ym/mec/student/controller/RepairController.java

@@ -143,6 +143,11 @@ public class RepairController extends BaseController {
     @ApiOperation(value = "分页查询商品(教材、辅件)列表")
     @GetMapping("/queryGoodsPage")
     public Object queryPage(GoodsQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请先登录");
+        }
+        queryInfo.setOrganId(sysUser.getOrganId().toString());
         return succeed(goodsService.queryPage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/GoodsController.java

@@ -16,10 +16,8 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -118,23 +116,39 @@ public class GoodsController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('goods/queryPage')")
     public Object queryPage(GoodsQueryInfo queryInfo){
+        queryInfo.setOrganId(null);
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
         Employee employee = employeeDao.get(sysUser.getId());
-        if (StringUtils.isEmpty(queryInfo.getStudentShowOrganId()) &&
-                StringUtils.isEmpty(queryInfo.getEducationShowOrganId()) &&
-                StringUtils.isEmpty(queryInfo.getMusicShowOrganId()) &&
-                StringUtils.isEmpty(queryInfo.getCourseFeeShowOrganId()) &&
-                StringUtils.isEmpty(queryInfo.getMemberFeeShowOrganId()) &&
-                StringUtils.isEmpty(queryInfo.getReplacementShowOrganId())) {
+        if (queryInfo.getStudentShowOrganId() == null &&
+                queryInfo.getEducationShowOrganId() == null &&
+                queryInfo.getMusicShowOrganId() == null &&
+                queryInfo.getCourseFeeShowOrganId() == null &&
+                queryInfo.getMemberFeeShowOrganId() == null &&
+                queryInfo.getReplacementShowOrganId() == null) {
             queryInfo.setOrganId(employee.getOrganIdList());
         }else if(StringUtils.isEmpty(employee.getOrganIdList())){
             return failed("用户所在分部异常");
         }else {
-            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-            if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+            Set<Integer> list = Arrays.stream(employee.getOrganIdList().split(",")).map(s -> Integer.valueOf(s)).collect(Collectors.toSet());
+            if(!list.contains(queryInfo.getStudentShowOrganId())){
+                return failed("非法请求");
+            }
+            if(!list.contains(queryInfo.getEducationShowOrganId())){
+                return failed("非法请求");
+            }
+            if(!list.contains(queryInfo.getMusicShowOrganId())){
+                return failed("非法请求");
+            }
+            if(!list.contains(queryInfo.getCourseFeeShowOrganId())){
+                return failed("非法请求");
+            }
+            if(!list.contains(queryInfo.getMemberFeeShowOrganId())){
+                return failed("非法请求");
+            }
+            if(!list.contains(queryInfo.getReplacementShowOrganId())){
                 return failed("非法请求");
             }
         }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -188,6 +188,14 @@ public class EduRepairController extends BaseController {
     @ApiOperation(value = "分页查询商品(教材、辅件)列表")
     @GetMapping("/queryGoodsPage")
     public Object queryPage(GoodsQueryInfo queryInfo){
+        if(queryInfo.getStudentShowOrganId() == null &&
+                queryInfo.getEducationShowOrganId() == null &&
+                queryInfo.getMusicShowOrganId() == null &&
+                queryInfo.getCourseFeeShowOrganId() == null &&
+                queryInfo.getMemberFeeShowOrganId() == null &&
+                queryInfo.getReplacementShowOrganId() == null){
+            throw new BizException("请选择商品分部");
+        }
         return succeed(goodsService.queryPage(queryInfo));
     }