问卷调查

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

@@ -94,7 +94,7 @@
 	<select id="queryPage" resultMap="QuestionnaireTopic" parameterType="map">
 		SELECT * FROM questionnaire_topic
 		<include refid="queryPageSql"/>
-		ORDER BY id_
+		ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	

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

@@ -91,8 +91,11 @@
         FROM tenant_pre_join as a
         left join sys_user as b on a.recommender_ = b.id_
         <where>
+            <if test="param.recommender != null">
+                AND a.recommender_ = #{param.recommender}
+            </if>
             <if test="param.state != null">
-                and state_ = #{param.state}
+                AND state_ = #{param.state}
             </if>
             <if test="param.startTime != null">
                 AND created_time_ <![CDATA[ >= ]]> #{param.startTime}

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

@@ -1,6 +1,8 @@
 package com.ym.mec.web.controller;
 
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.TenantPreJoinDto;
 import com.ym.mec.biz.dal.entity.TenantPreJoin;
 import com.ym.mec.biz.dal.vo.TenantPreJoinVo;
@@ -35,11 +37,18 @@ public class TenantPreJoinController extends BaseController {
      */
     @Resource
     private TenantPreJoinService tenantPreJoinService;
+    @Resource
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("分页查询")
     @PostMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('tenantPreJoin/queryPage')")
     public HttpResponseResult<PageInfo<TenantPreJoinVo>> queryPage(@RequestBody Map<String, Object> param) {
+        //如果不是超管，那么只能看到推荐人自己的机构
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(!sysUser.getIsSuperAdmin()){
+            param.put("recommender",sysUser.getId());
+        }
         return succeed(tenantPreJoinService.queryPage(param));
     }