From 67123a1011c25e71984fcf3cf1226cfb821d09d0 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sun, 25 Aug 2024 14:26:02 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=89=AB=E7=A0=81=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/collect/IoCollectOrderBizMapper.xml    |  9 +++++----
 .../collect/IoCollectOrderCodeManMapper.xml       | 15 ++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
index 8e8c9f82a..3f4e59f85 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
@@ -5,8 +5,8 @@
             resultType="com.glxp.api.res.collect.CollectOrderBizResponse">
         SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory
         FROM io_collect_order_biz icob
-                     left join basic_udirel bu on icob.relId = bu.id
-                     left join basic_products bp on bu.uuid = bp.uuid
+                 left join basic_udirel bu on icob.relId = bu.id
+                 left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="thrCode != '' and thrCode != null">
                 AND icob.thrCode LIKE concat('%', #{thrCode}, '%')
@@ -23,12 +23,13 @@
             <if test="unionCode != '' and unionCode != null">
                 and (
                         bp.nameCode LIKE concat('%', #{unionCode}, '%')
-                                or bp.ybbm LIKE concat('%', #{unionCode}, '%')
-                                or bp.sptm LIKE concat('%', #{unionCode}, '%'))
+                        or bp.ybbm LIKE concat('%', #{unionCode}, '%')
+                        or bp.sptm LIKE concat('%', #{unionCode}, '%'))
             </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
         </where>
+        group by icob.id
     </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml
index 9885a4863..dddee6f88 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml
@@ -4,14 +4,14 @@
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderCodeManRequest"
             resultType="com.glxp.api.res.collect.CollectOrderCodeManResponse">
         SELECT icocm.*,
-        bp.cpmctymc,
-        COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
-        bp.bzgg,
-        bp.zczbhhzbapzbh,
-        bp.manufactory
+               bp.cpmctymc,
+               COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
+               bp.bzgg,
+               bp.zczbhhzbapzbh,
+               bp.manufactory
         FROM io_collect_order_code_man icocm
-        left join basic_udirel bu on icocm.relId = bu.id
-        left join basic_products bp on bu.uuid = bp.uuid
+                 left join basic_udirel bu on icocm.relId = bu.id
+                 left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND icocm.orderIdFk = #{orderIdFk}
@@ -26,5 +26,6 @@
                 AND icocm.bizIdFk = #{bizIdFk}
             </if>
         </where>
+        group by icocm.id
     </select>
 </mapper>

From 52b08c7afc0cd4c9cc4e6e7c2279435c1d6aa406 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sun, 25 Aug 2024 15:30:00 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=8D=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/basic/BasicCollectPointCategoryMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/basic/BasicCollectPointCategoryMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicCollectPointCategoryMapper.xml
index 7b7c61d6e..846e3f13e 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicCollectPointCategoryMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicCollectPointCategoryMapper.xml
@@ -13,7 +13,7 @@
                 and invCode = #{invCode}
             </if>
         </where>
-        ORDER BY id DESC
+        ORDER BY code
     </select>
     <select id="selectAll" resultType="com.glxp.api.entity.basic.BasicCollectPointCategory">
         SELECT *

From 1738822d07fe74f94422b4a3bad5291b3976a365 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sun, 25 Aug 2024 16:21:39 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=94=A8=E6=88=B7=E5=B7=A5=E4=BD=8D=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/basic/BasicCollectUserController.java    | 6 +++++-
 .../com/glxp/api/req/basic/BasicCollectUserRequest.java     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
index 471e06dc0..d43f37488 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
@@ -3,6 +3,7 @@ package com.glxp.api.controller.basic;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.BasicCollectPointEntity;
 import com.glxp.api.entity.basic.BasicCollectUserEntity;
 import com.glxp.api.req.basic.BasicCollectRequest;
@@ -28,13 +29,16 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-public class BasicCollectUserController {
+public class BasicCollectUserController extends BaseController {
 
     @Resource
     private BasicCollectUserService basicCollectUserService;
 
     @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
     public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
+        if (request.getAutoUserId() == 1){
+            request.setUserId(String.valueOf(getUserId()));
+        }
         List<UserWorkResponse> page = basicCollectUserService.filterList(request);
         PageInfo<UserWorkResponse> pageInfo = new PageInfo<>(page);
         PageSimpleResponse<UserWorkResponse> pageSimpleResponse = new PageSimpleResponse<>();
diff --git a/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java b/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java
index 0b8edd230..1746bfb20 100644
--- a/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java
@@ -21,5 +21,7 @@ public class BasicCollectUserRequest extends ListPageRequest {
     private String userKey;
     private String workKey;
 
+    private Integer autoUserId;
+
 
 }

From 445514e2cce5b45f30b2c6090626cea12fe724db Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sun, 25 Aug 2024 16:42:28 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/BasicCollectUserController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
index d43f37488..f36ed0e85 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
@@ -36,7 +36,7 @@ public class BasicCollectUserController extends BaseController {
 
     @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
     public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
-        if (request.getAutoUserId() == 1){
+        if (request != null && request.getAutoUserId() == 1){
             request.setUserId(String.valueOf(getUserId()));
         }
         List<UserWorkResponse> page = basicCollectUserService.filterList(request);

From d83ab87193465d7e04ea97ee7b9a09badf9ed9fa Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sun, 25 Aug 2024 16:56:44 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/BasicCollectUserController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
index f36ed0e85..cfa37fa91 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
@@ -36,7 +36,7 @@ public class BasicCollectUserController extends BaseController {
 
     @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
     public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
-        if (request != null && request.getAutoUserId() == 1){
+        if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1){
             request.setUserId(String.valueOf(getUserId()));
         }
         List<UserWorkResponse> page = basicCollectUserService.filterList(request);