diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml index 783fe780..fdc7ff26 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/v3/mapper/AccExceptionRecordMapper.xml @@ -36,7 +36,7 @@ t2.nick_name as cust_name, t2.cust_num, t2.phonenumber as mobile, -# t2.org_full_name, + t4.order_id, t4.mac_order_id, t4.order_time, @@ -88,7 +88,7 @@ and (t2.cust_num LIKE CONCAT('%', #{param.keyword},'%') or t2.nick_name = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} or t2.phonenumber = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} -# or t2.mobile_suffix = #{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.SM4EncDecHandler} + or t2.nick_name_like LIKE CONCAT('%',#{param.keyword,typeHandler=com.bonus.canteen.core.common.encrypt.CipherQueryLikeHandler},'%') ) diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml index e4facc0d..0769c124 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/auth/MgrRoleCanteenMapper.xml @@ -14,9 +14,9 @@ SELECT id, parent_id, tree_name, tree_type, biz_type FROM (select data_id -# ,half_select + from (SELECT r.data_id -# , r.half_select + FROM sys_role_canteen r LEFT JOIN sys_role o ON o.role_id = r.role_id LEFT JOIN sys_user_role u ON r.role_id = u.role_id @@ -110,7 +110,7 @@ SELECT mrc.role_id FROM sys_role_canteen mrc WHERE mrc.data_id = #{dataId} -# AND mrc.half_select = #{excludeMiddle} + AND mrc.role_id != #{roleId} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml index 12d47265..79920b1a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml @@ -63,83 +63,91 @@ ci.phonenumber as mobile, ci.email, ci.sex, - -- ci.age, + ci.id_card, ci.birthday, ci.face_url as cust_photo_url, ci.dept_id as org_id, -# ci.cust_third_id, -# ci.org_num, -# ci.org_full_name, -# ci.place_id, -# place.place_num, -# place.place_full_name, - ci.psn_type, - ci.psn_type_name, - ci.home_addr, -# ci.qq, -# ci.wechat, -# ci.company_wechat, -# ci.dingtalk, -# ci.emer_contact_person, -# ci.emer_contact_num, -# ci.emer_contact_card, -# ci.job, -# ci.job_rank, -# ci.job_level, -# ci.job_title, -# ci.job_title_rank, -# ci.auth_strength, -# ci.entry_date, -# ci.signing_date, -# ci.expiry_date, -# ci.cust_type, + + ci.psn_type, + ci.psn_type_name, + ci.home_addr, + ci.birthday -# cd.label_ids, -# cd.label_names, -# cd.taste_ids, -# cd.taste_names, -# ai.end_date accEndDate, -# ci.doctor_num, -# ci.hospital_num - + + - + - +