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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectDao.java

@@ -170,4 +170,6 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
     List<Subject> queryPageByIdOrName(Map<String, Object> params);
 
     int queryPageByIdOrNameCount(Map<String, Object> params);
+
+    List<Subject> list();
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantInfoDao.java

@@ -16,4 +16,6 @@ public interface TenantInfoDao extends BaseMapper<TenantInfo> {
     TenantProductSumm queryTenantInfoProductSumm(Integer tenantId);
 
     TenantInfo getOpenTenant(Integer tenantId);
+
+    TenantInfo queryTenantInfoByOrgan(@Param("organId") Integer organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -109,4 +109,10 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @return 查询结果
      */
     PageInfo<Subject> queryPageByIdOrName(SubjectQueryInfo queryInfo);
+
+    /**
+     * 列出声部
+     * @return
+     */
+    List<Subject> list();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoService.java

@@ -48,4 +48,6 @@ public interface TenantInfoService extends IService<TenantInfo> {
     * @date 2022/1/7 14:42
     */
     void saveTenantContextHolder(HttpServletRequest request);
+
+    TenantInfo queryTenantInfoByOrgan(Integer organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectServiceImpl.java

@@ -238,6 +238,10 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
         }
         pageInfo.setRows(dataList);
         return pageInfo;
+    }
 
+    @Override
+    public List<Subject> list() {
+        return subjectDao.list();
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -697,4 +697,9 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             }
         }
     }
+
+    @Override
+    public TenantInfo queryTenantInfoByOrgan(Integer organId) {
+        return baseMapper.queryTenantInfoByOrgan(organId);
+    }
 }

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

@@ -274,5 +274,8 @@
             #{userId}
         </foreach>
     </select>
+    <select id="list" resultMap="Subject">
+        select * from subject where del_flag_ = 0 and parent_subject_id_ != 0
+    </select>
 
 </mapper>

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

@@ -108,5 +108,9 @@
     <select id="getOpenTenant" resultType="com.ym.mec.biz.dal.entity.TenantInfo">
         SELECT * FROM tenant_info WHERE id_ = #{tenantId} AND state_ = 1
     </select>
+    <select id="queryTenantInfoByOrgan" resultType="com.ym.mec.biz.dal.entity.TenantInfo">
+        select * from tenant_info
+        where id_ = (select id_ from organization where tenant_id_ = #{tenantId})
+    </select>
 
 </mapper>

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

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 
 @RequestMapping("sysCouponCode")
@@ -30,17 +31,16 @@ public class SysCouponCodeController extends BaseController {
     @Autowired
     private SysCouponIssueRecordService couponIssueRecordService;
 
-
     @ApiOperation("分页查询")
     @RequestMapping(value = "queryPage")
     public HttpResponseResult queryPage(SysCouponCodeQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser != null && sysUser.getId() != null) {
+        if (Objects.isNull(queryInfo.getUserId())) {
+            SysUser sysUser = sysUserFeignService.queryUserInfo();
+            if (Objects.isNull(sysUser.getId())) {
+                return failed("请登录");
+            }
             queryInfo.setUserId(sysUser.getId());
         }
-        if (queryInfo.getUserId() == null) {
-            return failed("请登录");
-        }
         return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
     }
 

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

@@ -103,9 +103,17 @@ public class SubjectController extends BaseController {
 
     @ApiOperation(value = "搜索按Id和名称")
     @PostMapping("/queryPageByIdOrName")
-    // @PreAuthorize("@pcs.hasPermissions('subject/queryPageByIdOrName')")
+    @PreAuthorize("@pcs.hasPermissions('subject/queryPageByIdOrName')")
     public Object queryPageByIdOrName(SubjectQueryInfo queryInfo){
         return succeed(subjectService.queryPageByIdOrName(queryInfo));
     }
 
+
+    @ApiOperation(value = "列出所有分部")
+    @PostMapping("/list")
+    // @PreAuthorize("@pcs.hasPermissions('subject/list')")
+    public Object list(){
+        return succeed(subjectService.list());
+    }
+
 }

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

@@ -75,6 +75,13 @@ public class TenantInfoController extends BaseController {
         return succeed(tenantInfoService.queryTenantInfoCheck(id));
     }
 
+    @ApiOperation("查询单个机构详情按分部Id")
+    @GetMapping(value = "/queryTenantInfoByOrgan/{organId}")
+    public Object queryTenantInfoByOrgan(@ApiParam(value = "分部ID", required = true) @PathVariable("organId") Integer organId) {
+        return succeed(tenantInfoService.queryTenantInfoByOrgan(organId));
+    }
+
+
     @ApiOperation("查询机构产品")
     @GetMapping(value = "/queryTenantInfoSumm")
     public HttpResponseResult<TenantProductSumm> queryTenantInfoProductSumm() {