From c6bf3a8d886896e6bf29ed13cd93a1d9f9239dff Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 05 三月 2024 10:25:41 +0800
Subject: [PATCH] 组织完善

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java |    3 ++-
 ycl-server/src/main/resources/mapper/zgyw/YwPeopleMapper.xml                  |   16 ++++++++++++++++
 ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java                    |    2 +-
 ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java    |    3 ++-
 ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java                      |    2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
index cb599c4..69eb752 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
@@ -13,7 +13,7 @@
 public class AbsQuery {
 
     @ApiModelProperty(value = "褰撳墠椤�", required = true)
-    private Long currentPage = 1L;
+    private Long pageNum = 1L;
 
     @ApiModelProperty(value = "姣忛〉鏉℃暟", required = true)
     private Long pageSize = 10L;
diff --git a/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java b/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
index 35eebc3..7f1defe 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/page/PageUtil.java
@@ -21,7 +21,7 @@
      */
     public static  <T extends AbsEntity, Q extends AbsQuery> IPage<T> getPage(Q q, Class<T> c) {
         Page<T> page = new Page<T>()
-                .setCurrent(q.getCurrentPage())
+                .setCurrent(q.getPageNum())
                 .setSize(q.getPageSize());
         return page;
     }
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
index bc5a1ab..6335506 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -6,6 +6,7 @@
 import com.ycl.system.domain.group.Add;
 import com.ycl.platform.domain.query.YwUnitQuery;
 import com.ycl.platform.service.YwUnitService;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import lombok.RequiredArgsConstructor;
 import java.util.List;
@@ -54,7 +55,7 @@
         return ywUnitService.remove(ids);
     }
 
-//    @PreAuthorize("@ss.hasPermi('unit:list')")
+    @PreAuthorize("@ss.hasPermi('unit:list')")
     @GetMapping("/page")
     @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
     public Result page(YwUnitQuery query) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index ac43dd6..0864f1c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -38,6 +38,7 @@
      */
     @Override
     public Result add(YwUnitForm form) {
+        // todo 澧炲姞瀵瑰簲璐﹀彿
         YwUnit entity = YwUnitForm.getEntityByForm(form, null);
         if(baseMapper.insert(entity) > 0) {
             return Result.ok("娣诲姞鎴愬姛");
@@ -52,7 +53,7 @@
      */
     @Override
     public Result update(YwUnitForm form) {
-
+        // todo 淇敼瀵瑰簲璐﹀彿
         YwUnit entity = baseMapper.selectById(form.getId());
 
         // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPeopleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPeopleMapper.xml
new file mode 100644
index 0000000..018ead6
--- /dev/null
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPeopleMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.platform.mapper.YwPeopleMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="YwPeopleVO">
+        <result column="id" property="id" />
+        <result column="yw_person_code" property="ywPersonCode" />
+        <result column="yw_person_name" property="ywPersonName" />
+        <result column="yw_person_account" property="ywPersonAccount" />
+        <result column="belong_unit" property="belongUnit" />
+        <result column="add_way" property="addWay" />
+        <result column="phone" property="phone" />
+    </resultMap>
+
+</mapper>

--
Gitblit v1.8.0