From a3ccec7a8ad583c345c11979fe71729266ce46e8 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 화, 07 12월 2021 16:33:57 +0900 Subject: [PATCH] - api 이슈 추가시 하위 일감인 이슈만 수정 가능 - api로 이슈 수정시 수정할 이슈를 찾을때 custom_field_type 이 DATETIME 인 항목은 판단에서 제외시키도록 수정 --- src/main/resources/mybatis/query-template/companyField-template.xml | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml index 4dd9d58..c40ca51 100644 --- a/src/main/resources/mybatis/query-template/companyField-template.xml +++ b/src/main/resources/mybatis/query-template/companyField-template.xml @@ -5,19 +5,20 @@ <select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition"> SELECT - c.id as id, - c.name as name, - c.tel as tel, - c.email as email, - c.memo as memo + cf.id as id, + cf.name as name, + cf.manager as manager, + cf.tel as tel, + cf.email as email, + cf.memo as memo FROM - company c + company_field cf WHERE 1=1 <if test="name != '' and name != null"> - AND c.name like CONCAT('%',#{name},'%') + AND cf.name like CONCAT('%',#{name},'%') </if> <if test="id != '' and id != null"> - AND c.id like CONCAT('%',#{id},'%') + AND cf.id like CONCAT('%',#{id},'%') </if> <if test="pageSize != '' and pageSize != null"> limit #{pageSize} offset #{page}; @@ -26,15 +27,15 @@ <select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.CompanyFieldCondition"> SELECT - count(c.id) + count(cf.id) FROM - company c + company_field cf WHERE 1=1 <if test="name != '' and name != null"> - AND c.name like CONCAT('%',#{name},'%') + AND cf.name like CONCAT('%',#{name},'%') </if> <if test="id != '' and id != null"> - AND c.id like CONCAT('%',#{id},'%') + AND cf.id like CONCAT('%',#{id},'%') </if> </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0