lyhzzz 9 月之前
父節點
當前提交
1ab69d9e0a

+ 3 - 1
doc/update-1.5.0.sql

@@ -3,6 +3,9 @@ CREATE TABLE `4dkankan_v4`.`jy_platform`  (
                                            `id` int NOT NULL AUTO_INCREMENT,
                                            `platform_name` varchar(255) NULL COMMENT '平台名称',
                                            `platform_address` varchar(255) NULL COMMENT '平台地址',
+                                           `name` varchar(255)  DEFAULT NULL COMMENT '平台管理员姓名',
+                                           `phone` varchar(255) DEFAULT NULL COMMENT '平台管理手机号码',
+                                           `id_card` varchar(255)  DEFAULT NULL COMMENT '身份证号码',
                                            `rec_status` varchar(255) NULL DEFAULT 'A',
                                            `status` int NULL DEFAULT 0 COMMENT '是否禁用,0否,1是' ,
                                            `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
@@ -19,7 +22,6 @@ CREATE TABLE `4dkankan_v4`.`jy_user_platform`  (
                                            `phone` varchar(255) DEFAULT NULL COMMENT '平台管理手机号码',
                                            `id_card` varchar(255)  DEFAULT NULL COMMENT '身份证号码',
                                            `status` int DEFAULT '0' COMMENT '是否禁用,0否,1是',
-                                           `role_type` int DEFAULT '0' COMMENT '0平台管理员,1平台用户',
                                            `rec_status` varchar(255) NULL DEFAULT 'A',
                                            `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
                                            `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

+ 17 - 0
src/main/java/com/fdkankan/manage/entity/JyPlatform.java

@@ -40,6 +40,23 @@ public class JyPlatform implements Serializable {
     @TableField("platform_address")
     private String platformAddress;
 
+    /**
+     * 平台管理员姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 平台管理手机号码
+     */
+    @TableField("phone")
+    private String phone;
+    /**
+     * 平台管理身份证号码
+     */
+    @TableField("id_card")
+    private String idCard;
+
 
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")

+ 0 - 5
src/main/java/com/fdkankan/manage/entity/JyUserPlatform.java

@@ -56,11 +56,6 @@ public class JyUserPlatform implements Serializable {
     @TableField("status")
     private Integer status;
 
-    /**
-     * 0平台管理员,1平台用户
-     */
-    @TableField("role_type")
-    private Integer roleType;
 
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")

+ 0 - 1
src/main/java/com/fdkankan/manage/service/impl/JyUserPlatformServiceImpl.java

@@ -59,7 +59,6 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
     public JyUserPlatform getByPlatformAdmin(Integer platformId) {
         LambdaQueryWrapper<JyUserPlatform> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(JyUserPlatform::getPlatformId,platformId);
-        wrapper.eq(JyUserPlatform::getRoleType,0);
         return this.getOne(wrapper);
     }
 

+ 0 - 4
src/main/java/com/fdkankan/manage/vo/request/JyPlatformVo.java

@@ -35,10 +35,6 @@ public class JyPlatformVo{
      */
     private Integer status;
 
-    /**
-     * 0平台管理员,1平台用户
-     */
-    private Integer roleType;
 
     private String createTime;
 }

+ 1 - 1
src/main/resources/mapper/manage/JyPlatformMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.request.JyPlatformVo">
         select * from t_platform p left join  t_user_plaftform u on p.id = u.platform_id
-        where p.rec_status = 'A' and u.rec_status = 'A' and u.role_type = 0
+        where p.rec_status = 'A' and u.rec_status = 'A'
         <if test="param.platformAddress != null and param.platformAddress !=''">
             and p.platform_address like concat ('%',#{param.platformAddress},'%')
         </if>

+ 1 - 1
src/main/resources/mapper/manage/JyUserPlatformMapper.xml

@@ -5,7 +5,7 @@
     <select id="pageList" resultType="com.fdkankan.manage.vo.request.JyUserPlatformVo">
         select * from jy_user_platform up left join jy_user jy on up.jy_user_id = jy.id
                                           left join jy_platform jp on up.platform_id = jp.id
-        where up.rec_status = 'A' and jy.rec_status = 'A' and jp.rec_status = 'A' and up.role_type = 1
+        where up.rec_status = 'A' and jy.rec_status = 'A' and jp.rec_status = 'A' and up.id_card != jp.id_card
         <if test="param.name != null and param.name !=''">
             and up.name like concat ('%',#{param.name},'%')
         </if>