用户、组织、岗位加些字段

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java

@@ -100,4 +100,12 @@ public class SysOrg extends CommonEntity {
     @ApiModelProperty(value = "宣传图路径", position = 7)
     @TableField(exist = false,insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     private String propagandizePicPath;
+
+    /** 描述 */
+    private String remark;
+
+    /** 用户组类型("用户组类型 2组织用户组 1自建用户组")*/
+    private String type;
+
+
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/mapper/mapping/SysOrgMapper.xml

@@ -27,7 +27,9 @@
             IFNULL(so.BADGE,'') AS badge,
             IFNULL(CAST(df.DOWNLOAD_PATH AS VARCHAR),'') AS badgePath,
             IFNULL(so.PROPAGANDIZE_PIC,'')  AS propagandizePic,
-            IFNULL(CAST(df2.DOWNLOAD_PATH AS VARCHAR),'') AS propagandizePicPath
+            IFNULL(CAST(df2.DOWNLOAD_PATH AS VARCHAR),'') AS propagandizePicPath,
+            so.remark,
+            so.type
         FROM SYS_ORG so
         LEFT JOIN DEV_FILE df ON so.BADGE =df.ID AND df.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN DEV_FILE df2 ON so.PROPAGANDIZE_PIC =df2.ID AND df2.DELETE_FLAG ='NOT_DELETE'

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgAddParam.java

@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo.sys.modular.org.param;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -69,4 +70,11 @@ public class SysOrgAddParam {
     /** 宣传图 */
     @ApiModelProperty(value = "宣传图", position = 7)
     private String propagandizePic;
+
+
+    /** 描述 */
+    private String remark;
+
+    /** 用户组类型("用户组类型 2组织用户组 1自建用户组")*/
+    private String type;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgEditParam.java

@@ -73,4 +73,10 @@ public class SysOrgEditParam {
     /** 宣传图 */
     @ApiModelProperty(value = "宣传图", position = 7)
     private String propagandizePic;
+
+    /** 描述 */
+    private String remark;
+
+    /** 用户组类型("用户组类型 2组织用户组 1自建用户组")*/
+    private String type;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/position/entity/SysPosition.java

@@ -68,4 +68,9 @@ public class SysPosition extends CommonEntity {
     @ApiModelProperty(value = "是否是资源库特殊账号，0否1是")
     @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     private String isResourceaccount;
+    /**  状态（0正常;1停用）*/
+    private String status;
+    /** 备注 */
+    private String remark;
+
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/position/param/SysPositionAddParam.java

@@ -52,4 +52,9 @@ public class SysPositionAddParam {
     /** 扩展JSON */
     @ApiModelProperty(value = "扩展JSON", position = 5)
     private String extJson;
+
+    /**  状态（0正常;1停用）*/
+    private String status;
+    /** 备注 */
+    private String remark;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/position/param/SysPositionEditParam.java

@@ -57,4 +57,9 @@ public class SysPositionEditParam {
     /** 扩展JSON */
     @ApiModelProperty(value = "扩展JSON", position = 6)
     private String extJson;
+
+    /**  状态（0正常;1停用）*/
+    private String status;
+    /** 备注 */
+    private String remark;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java

@@ -347,5 +347,11 @@ public class SysUser extends CommonEntity {
     @ApiModelProperty(value = "学届", position = 7)
     private String fallDue;
 
+    /** 人员编码 */
+    private String code;
+
+    /** 账号类型 */
+    private String userType;
+
 
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/mapper/mapping/SysUserMapper.xml

@@ -56,7 +56,9 @@
             IFNULL (t1.GRADES_ID,'') AS gradesId,
             IFNULL (gr.grades_name,'') AS gradesIdName,
             IFNULL (t1.STUDENT_NUM ,'') AS studentNum,
-            IFNULL (t1.FALL_DUE  ,'') AS fallDue
+            IFNULL (t1.FALL_DUE  ,'') AS fallDue,
+            t1.code,
+            t1.user_type AS userType
         FROM SYS_USER t1
         LEFT JOIN SYS_ORG co1 ON t1.COLLEGE_ID=co1.id AND co1.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co2 ON t1.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserAddParam.java

@@ -207,4 +207,11 @@ public class SysUserAddParam {
      * 学届
      */
     private String fallDue;
+
+
+    /** 人员编码 */
+    private String code;
+
+    /** 账号类型 */
+    private String userType;
 }

snowy-plugin/snowy-plugin-sys/snowy-plugin-sys-func/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserEditParam.java

@@ -214,5 +214,9 @@ public class SysUserEditParam {
      */
     private String fallDue;
 
+    /** 人员编码 */
+    private String code;
 
+    /** 账号类型 */
+    private String userType;
 }