员工管理 采购订单 仓库名重复

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -2625,37 +2625,6 @@
         </if>
     </select>
 
-    <!--获取仓库-->
-    <select id="getWarehouseByPage" resultType="java.util.Map">
-        SELECT mtw.wh_id as "whId",sys.f_code_name(mtw.wh_code,mtw.wh_name) AS "whCodeName"
-        FROM mst.t_warehouse mtw left join core.t_user ctu on ctu.user_id = mtw.op_create_user_id
-        WHERE mtw.fty_id = #{ftyId}
-        and mtw.flg_valid
-        <if test="whCode!=null and whCode!=''">
-            and position(#{whCode} in mtw.wh_code) > 0
-        </if>
-        <if test="whName!=null and whName!=''">
-            and position(#{warehouseName} in mtw.wh_name) > 0
-        </if>
-        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
-            limit #{end} offset #{start}
-        </if>
-    </select>
-
-    <!--获取仓库个数-->
-    <select id="countWarehouseByPage" resultType="Long">
-        select count(1)
-        from mst.t_warehouse mtw
-        WHERE mtw.fty_id = #{ftyId}
-        and mtw.flg_valid
-        <if test="whCode!=null and whCode!=''">
-            and position(#{whCode} in mtw.wh_code) > 0
-        </if>
-        <if test="whName!=null and whName!=''">
-            and position(#{warehouseName} in mtw.wh_name) > 0
-        </if>
-    </select>
-
     <!--获取仓位-->
     <select id="getWarehousePlaceByPage" resultType="java.util.Map">
         SELECT mtwp.place_id as "placeId", mtwp.place_name as "placeName",

src/main/java/com/dk/mdm/mapper/mst/StaffMapper.xml

@@ -69,8 +69,8 @@
                 AND t.hr_status = #{hrStatus}
             </if>
             <if test="roleIds != null and roleIds.size()>0">
-                AND t.role_ids =
-                any(#{roleIds, typeHandler=StringListTypeHandler})
+                AND t.role_ids &amp;&amp;
+                #{roleIds, typeHandler=UuidListTypeHandler}
             </if>
             <if test="orgIds != null and orgIds.size()>0">
                 AND t.org_id =

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -256,7 +256,7 @@
     <sql id="Condition_1">
         <where>
             <if test="purNo != null and purNo != ''">
-                AND tpp.pur_no = #{purNo}
+                AND tpp.pur_no like concat('%', my_ex.likequery(#{purNo}) , '%')
             </if>
             <if test="purType != null and purType != ''">
                 AND tpp.pur_type = #{purType}
@@ -271,10 +271,10 @@
                 AND tpp.sup_id = #{supId}::uuid
             </if>
             <if test="contactName != null and contactName != ''">
-                AND tpp.contact_name = #{contactName}
+                AND tpp.contact_name like concat('%', my_ex.likequery(#{contactName}) , '%')
             </if>
             <if test="contactPhone != null and contactPhone != ''">
-                AND tpp.contact_phone = #{contactPhone}
+                AND tpp.contact_phone like concat('%', my_ex.likequery(#{contactPhone}) , '%')
             </if>
             <if test="pickupDate != null">
                 AND tpp.pickup_date = #{pickupDate}

src/main/java/com/dk/mdm/model/query/mst/StaffQuery.java

@@ -221,8 +221,8 @@ public class StaffQuery extends PageInfo<StaffQuery> implements Serializable {
      * @desc   : 角色list
      */
     @ApiModelProperty(value = "员工状态list")
-    @TableField(typeHandler = UuidListTypeHandler.class)
-    private String roleIds;
+    @TableField(exist = false)
+    private List<String> roleIds;
 
     /**
      * @desc   : 组织部门list