股东信息先排除金树林下层部门

ruoyi-equity/src/main/java/com/ruoyi/equity/controller/ShareholderInfoController.java

@@ -89,6 +89,7 @@ public class ShareholderInfoController extends BaseController
 
     /**
      * 查询股东信息列表
+     *      3.11 因为下层增加了部门，所以说查询的时候先排除下层
      */
     @ApiOperation("获取股东列表")
     @PreAuthorize("@ss.hasPermi('equity:info:list')")
@@ -97,7 +98,7 @@ public class ShareholderInfoController extends BaseController
     {
         startPage();
         List<ShareholderInfoVO> list = shareholderInfoService.selectShareholderInfoList(shareholderInfo);
-        logger.info("返回的集合内容是：{}",list);
+//        logger.info("返回的集合内容是：{}",list);
         return getDataTable(list);
     }
 
@@ -133,9 +134,9 @@ public class ShareholderInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('equity:info:edit')")
     @Log(title = "股东信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ShareholderInfo shareholderInfo)
+    public R<Integer> edit(@RequestBody ShareholderInfo shareholderInfo)
     {
-        return toAjax(shareholderInfoService.updateShareholderInfo(shareholderInfo));
+        return R.ok(shareholderInfoService.updateShareholderInfo(shareholderInfo));
     }
 
     /**

ruoyi-equity/src/main/resources/mapper/equity/ShareholderInfoMapper.xml

@@ -30,11 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select shareholder_id, parent_id, ancestors, shareholder_name, shareholder_type, shareholding_ratio, controlled_company as thecompany, company_valuation, is_subject, node_type, create_by, create_time, update_by, update_time, remark ,
         (select shareholder_name from e_shareholder_info where thecompany = shareholder_id) as companyName
          from e_shareholder_info
-        <where>  
+        where (is_subject = 1 or node_type = 1)
             <if test="shareholderName != null  and shareholderName != ''"> and shareholder_name like concat('%', #{shareholderName}, '%')</if>
             <if test="shareholderType != null  and shareholderType != ''"> and shareholder_type = #{shareholderType}</if>
             <if test="controlledCompany != null "> and controlled_company = #{controlledCompany}</if>
-        </where>
     </select>
     
     <select id="selectShareholderInfoByShareholderId" parameterType="Long" resultMap="ShareholderInfoResult">