Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-vue-master into dev-yf

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysUploadFileService;
@@ -93,10 +94,11 @@ public class RiskPlanAppController extends BaseController {
      * @real_return {@link R<List<LedgerProject>>}
      */
     @GetMapping("/project/list")
-    public R<List<LedgerProject>> getProjectList(LedgerProject ledgerProject) {
+    public TableDataInfo getProjectList(LedgerProject ledgerProject) {
         //添加自身及以下部门筛选
         ledgerProject.setDeptId(getLoginUser().getDeptId());
-        return R.ok(ledgerProjectService.getProjectListByDeptId(ledgerProject));
+        startPage();
+        return getDataTable(ledgerProjectService.getProjectListByDeptId(ledgerProject));
     }
 
     /**

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskExistingListSaveDto.java

@@ -17,6 +17,9 @@ public class RiskExistingListSaveDto {
     /** 评估人id */
     private Long userId;
 
+    /** 固有风险 */
+    private Long inherentId;
+
     /** 房间id */
     private Long roomId;
 

censoft-rongtong/src/main/resources/mapper/system/LedgerProjectMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             ( lp.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR find_in_set( #{deptId}, ancestors ) ) )
             AND lp.STATUS = '0' AND lp.del_flag = '0'
-
+        <if test="name != null  and name != ''"> and lp.name like concat('%', #{name}, '%')</if>
     </select>
 
     <insert id="insertLedgerProject" parameterType="com.censoft.censoftrongtong.domain.LedgerProject" useGeneratedKeys="true" keyProperty="id">