guarantee-lsq 5 месяцев назад
Родитель
Сommit
0bdb1cc400

+ 2 - 0
platform-dao/src/main/java/com/platform/dao/dto/custom/CustomWorkflowRelationDTO.java

@@ -80,4 +80,6 @@ public class CustomWorkflowRelationDTO extends BaseDTO implements Serializable {
      */
     private String keyword;
 
+    private String flowName;
+
 }

+ 0 - 1
platform-dao/src/main/java/com/platform/dao/vo/query/custom/CustomWorkflowRelationVO.java

@@ -62,5 +62,4 @@ public class CustomWorkflowRelationVO extends BaseVO implements Serializable {
 
     private String flowName; // 流程名称
 
-
 }

+ 2 - 2
platform-dao/src/main/resources/mapper/custom/CustomWorkflowRelationMapper.xml

@@ -44,8 +44,8 @@
         <if test="updateUserName != null and updateUserName != ''">
             and flowrelation.update_user_name = #{updateUserName}
         </if>
-        <if test="keyword != null and keyword != ''">
-            and flowrelation.id like concat(concat('%',#{keyword}),'%')
+        <if test="flowName != null and flowName != ''">
+            and flow.name like concat(concat('%',#{flowName}),'%')
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.custom.CustomWorkflowRelationDTO" resultType="com.platform.dao.vo.query.custom.CustomWorkflowRelationVO">

+ 4 - 0
platform-service/src/main/java/com/platform/service/custom/impl/CustomWorkflowRelationServiceImpl.java

@@ -6,6 +6,7 @@ import com.platform.common.exception.DeniedException;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.SecurityUtils;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.custom.CustomWorkflowRelationDTO;
 import com.platform.dao.entity.custom.CustomWorkflowRelation;
@@ -43,6 +44,9 @@ public class CustomWorkflowRelationServiceImpl extends BaseServiceImpl<CustomWor
     @Override
     public AbstractPageResultBean<CustomWorkflowRelationVO> selectPageList(CustomWorkflowRelationDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if(StringUtils.isNotBlank(record.getFlowName())){
+            record.setFlowName(record.getFlowName().trim());
+        }
         return new MyPage(mapper.selectList(record));
     }