修改课题组新增逻辑

research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.research.common.annotation.Anonymous;
 import com.research.common.annotation.DataSource;
 import com.research.common.core.domain.AjaxResult;
 import com.research.common.core.domain.BaseDto;
@@ -78,6 +79,7 @@ public class GroupController {
     @Resource
     private TmsLoginService tmsLoginService;
 
+    @Anonymous
     @PostMapping("/query")
     public JsonResponse<PageInfo<GroupVO.Result>> queryGroupList(@RequestBody @Validated BaseDto<GroupDto.Query> query){
         if (query.getPageNum() > 0) {
@@ -100,6 +102,8 @@ public class GroupController {
         ktsGroupService.status(dto);
         return JsonResponse.ok();
     }
+
+    @Anonymous
     @PostMapping("/member/query")
     public JsonResponse<PageInfo<GroupVO.MemberResult>> queryMemberList(@RequestBody @Validated BaseDto<GroupDto.MemberQuery> query){
         if (query.getPageNum() > 0) {
@@ -107,41 +111,13 @@ public class GroupController {
         }
         return JsonResponse.ok(new PageInfo<>(ktsGroupService.queryMemberList(query.getParam())));
     }
+
+    @Anonymous
     @PostMapping("/member/add")
 //    @DataSource(DataSourceType.MASTER)
     public JsonResponse<Integer> addMember(@RequestBody @Validated GroupDto.AddMember dto) throws Exception {
-//        //判定租户及数据源是否存在
-//        TmsTenant dmsTenant = tmsTenantMapper.selectByPrimaryKey(SecurityUtils.getTenantId());
-//        if (dmsTenant == null) {
-//            return JsonResponse.ok().fail("租户不存在");
-//        }
-//        SrvDataSource umsDataSource = srvDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId());
-//        if (umsDataSource == null || StrUtil.isEmpty(umsDataSource.getDataSourceKey())) {
-//            return JsonResponse.ok().fail("数据源不存在");
-//        }
-//
-//        //新增主库租户用户
-//        if (tmsLoginService.checkUserNameUnique(dto.getMemberPhone())) {
-//            return JsonResponse.ok().fail("新增用户'" + dto.getMemberPhone() + "'失败，登录账号已存在");
-//        }
-//        TmsTenantUser tmsTenantUser = new TmsTenantUser();
-//        tmsTenantUser.setCreateBy(SecurityUtils.getUsername());
-//        tmsTenantUser.setCreateTime(new Date());
-//        tmsTenantUser.setTenantId(SecurityUtils.getTenantId());
-//        tmsTenantUser.setTenantUserId(dto.getUserId());
-//        tmsTenantUser.setUserName(dto.getMemberName());
-//        tmsTenantUser.setNickName(dto.getMemberName());
-//        tmsTenantUser.setDelFlag((byte) 0);
-//        tmsTenantUser.setSlaverAdmin((byte) 0);
-//        tmsTenantUser.setPhonenumber(dto.getMemberPhone());
-//        tmsTenantUser.setId(IdUtil.getSnowflakeNextId());
-//        tmsTenantUserMapper.insertSelective(tmsTenantUser);
-//        //切换至从库
-//        DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey());
         KtsKtGroupMember ktsKtGroupMember = ktsGroupService.addMember(dto);
         aduit(ktsKtGroupMember.getId());
-//        //销毁切换数据源
-//        DynamicDataSourceContextHolder.clearDataSourceType();
         return JsonResponse.ok();
     }
 

research-admin/src/main/java/com/research/web/controller/client/project/MemberAduitController.java

@@ -0,0 +1,10 @@
+package com.research.web.controller.client.project;
+
+/**
+ * @Author zzc
+ * @Package com.research.web.controller.client.project
+ * @Date 2025/9/16 0:26
+ * @description:
+ */
+public class MemberAduitController {
+}

research-admin/src/main/java/com/research/web/controller/system/SysDeptController.java

@@ -1,6 +1,8 @@
 package com.research.web.controller.system;
 
 import java.util.List;
+
+import com.research.common.annotation.Anonymous;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,7 +39,8 @@ public class SysDeptController extends BaseController
     /**
      * 获取部门列表
      */
-    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @Anonymous
+//    @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
     public AjaxResult list(SysDept dept)
     {

research-admin/src/main/java/com/research/web/controller/system/SysDictDataController.java

@@ -3,6 +3,8 @@ package com.research.web.controller.system;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.research.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -72,6 +74,7 @@ public class SysDictDataController extends BaseController
     /**
      * 根据字典类型查询字典数据信息
      */
+    @Anonymous
     @GetMapping(value = "/type/{dictType}")
     public AjaxResult dictType(@PathVariable String dictType)
     {

research-common/src/main/java/com/research/common/core/controller/BaseController.java

@@ -197,6 +197,9 @@ public class BaseController
      */
     public String getUsername()
     {
+        if (getLoginUser() == null) {
+            return null;
+        }
         return getLoginUser().getUsername();
     }
 }

research-common/src/main/java/com/research/common/utils/SecurityUtils.java

@@ -58,7 +58,11 @@ public class SecurityUtils
     {
         try
         {
-            return getLoginUser().getUsername();
+            if (getLoginUserOrNull() != null) {
+                return getLoginUserOrNull().getUsername();
+            }else {
+                return null;
+            }
         }
         catch (Exception e)
         {
@@ -81,6 +85,18 @@ public class SecurityUtils
         }
     }
 
+    public static LoginUser getLoginUserOrNull()
+    {
+        try
+        {
+            return (LoginUser) getAuthentication().getPrincipal();
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+    }
+
     /**
      * 获取Authentication
      */

research-generator/src/main/resources/mbg.xml

@@ -62,7 +62,6 @@
 <!--            <table tableName="tms_tenant_user" domainObjectName="TmsTenantUser" enableDeleteByExample="false"/>-->
 <!--            <table tableName="tms_tenant_config" domainObjectName="TmsTenantConfig" enableDeleteByExample="false"/>-->
 <!--        <table tableName="tms_tenant_srv_relation" domainObjectName="TmsTenantSrvRelation" enableDeleteByExample="false"/>-->
-
 <!--        <table tableName="ach_achievement" domainObjectName="AchAchievement" enableDeleteByExample="false"/>-->
 <!--        <table tableName="ach_achievement_category" domainObjectName="AchAchievementCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="fud_fund_record" domainObjectName="FudFundRecord" enableDeleteByExample="false"/>-->
@@ -73,6 +72,7 @@
 <!--        <table tableName="prj_proj_document" domainObjectName="PrjProjDocument" enableDeleteByExample="false"/>-->
 <!--        <table tableName="prj_proj_info" domainObjectName="PrjProjInfo" enableDeleteByExample="false"/>-->
         <table tableName="prj_proj_org" domainObjectName="PrjProjOrg" enableDeleteByExample="false"/>
+        <table tableName="kts_kt_group_member_aduit" domainObjectName="KtsKtGroupMemberAduit" enableDeleteByExample="false"/>
 <!--        <table tableName="shs_ckwx_category" domainObjectName="ShsCkwxCategory" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_ckwx_info" domainObjectName="ShsCkwxInfo" enableDeleteByExample="false"/>-->
 <!--        <table tableName="shs_device_pic" domainObjectName="ShsDevicePic" enableDeleteByExample="false"/>-->

research-system/src/main/java/com/research/system/domain/dto/GroupDto.java

@@ -110,5 +110,22 @@ public class GroupDto {
         private Byte memberStatus;
         @ApiModelProperty("0不确认，如用户表已有该手机号信息，则报错提示  1确认添加")
         private Byte confirm;
+
+        private Long projId;
+
+        private Long projOrgId;
+
+        private Long parentKtId;
+
+        private String ktGroupName;
+
+        private Integer ktGroupSort;
+
+        private String ktGroupIntro;
+
+        @ApiModelProperty("负责人手机号")
+        private String phone;
+        @ApiModelProperty("负责人")
+        private String name;
     }
 }

research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java

@@ -0,0 +1,271 @@
+package com.research.system.domain.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class KtsKtGroupMemberAduit implements Serializable {
+    private Long id;
+
+    private Long category;
+
+    private Long deptId;
+
+    private String ktGroupIntro;
+
+    private String memberBirth;
+
+    private Byte memberEmail;
+
+    private Date memberGender;
+
+    private Byte memberName;
+
+    private Byte memberPhone;
+
+    private Integer parentMemberId;
+
+    private Integer password;
+
+    private Integer projOrgId;
+
+    private String roleIdList;
+
+    private Byte title;
+
+    private Byte type;
+
+    private Byte userId;
+
+    private Byte username;
+
+    private Byte delFlag;
+
+    private String createBy;
+
+    private Date createTime;
+
+    private String updateBy;
+
+    private Date updateTime;
+
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCategory() {
+        return category;
+    }
+
+    public void setCategory(Long category) {
+        this.category = category;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getKtGroupIntro() {
+        return ktGroupIntro;
+    }
+
+    public void setKtGroupIntro(String ktGroupIntro) {
+        this.ktGroupIntro = ktGroupIntro == null ? null : ktGroupIntro.trim();
+    }
+
+    public String getMemberBirth() {
+        return memberBirth;
+    }
+
+    public void setMemberBirth(String memberBirth) {
+        this.memberBirth = memberBirth == null ? null : memberBirth.trim();
+    }
+
+    public Byte getMemberEmail() {
+        return memberEmail;
+    }
+
+    public void setMemberEmail(Byte memberEmail) {
+        this.memberEmail = memberEmail;
+    }
+
+    public Date getMemberGender() {
+        return memberGender;
+    }
+
+    public void setMemberGender(Date memberGender) {
+        this.memberGender = memberGender;
+    }
+
+    public Byte getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(Byte memberName) {
+        this.memberName = memberName;
+    }
+
+    public Byte getMemberPhone() {
+        return memberPhone;
+    }
+
+    public void setMemberPhone(Byte memberPhone) {
+        this.memberPhone = memberPhone;
+    }
+
+    public Integer getParentMemberId() {
+        return parentMemberId;
+    }
+
+    public void setParentMemberId(Integer parentMemberId) {
+        this.parentMemberId = parentMemberId;
+    }
+
+    public Integer getPassword() {
+        return password;
+    }
+
+    public void setPassword(Integer password) {
+        this.password = password;
+    }
+
+    public Integer getProjOrgId() {
+        return projOrgId;
+    }
+
+    public void setProjOrgId(Integer projOrgId) {
+        this.projOrgId = projOrgId;
+    }
+
+    public String getRoleIdList() {
+        return roleIdList;
+    }
+
+    public void setRoleIdList(String roleIdList) {
+        this.roleIdList = roleIdList == null ? null : roleIdList.trim();
+    }
+
+    public Byte getTitle() {
+        return title;
+    }
+
+    public void setTitle(Byte title) {
+        this.title = title;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public Byte getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Byte userId) {
+        this.userId = userId;
+    }
+
+    public Byte getUsername() {
+        return username;
+    }
+
+    public void setUsername(Byte username) {
+        this.username = username;
+    }
+
+    public Byte getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Byte delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy == null ? null : updateBy.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", category=").append(category);
+        sb.append(", deptId=").append(deptId);
+        sb.append(", ktGroupIntro=").append(ktGroupIntro);
+        sb.append(", memberBirth=").append(memberBirth);
+        sb.append(", memberEmail=").append(memberEmail);
+        sb.append(", memberGender=").append(memberGender);
+        sb.append(", memberName=").append(memberName);
+        sb.append(", memberPhone=").append(memberPhone);
+        sb.append(", parentMemberId=").append(parentMemberId);
+        sb.append(", password=").append(password);
+        sb.append(", projOrgId=").append(projOrgId);
+        sb.append(", roleIdList=").append(roleIdList);
+        sb.append(", title=").append(title);
+        sb.append(", type=").append(type);
+        sb.append(", userId=").append(userId);
+        sb.append(", username=").append(username);
+        sb.append(", delFlag=").append(delFlag);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", remark=").append(remark);
+        sb.append("]");
+        return sb.toString();
+    }
+}

research-system/src/main/java/com/research/system/domain/vo/GroupVO.java

@@ -1,5 +1,6 @@
 package com.research.system.domain.vo;
 
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.research.system.domain.po.KtsKtGroup;
 import com.research.system.domain.po.KtsKtGroupMember;
@@ -113,6 +114,14 @@ public class GroupVO {
         @ApiModelProperty("合作单位名称")
         private String projOrgName;
         private String userName;
+        private String nickName;
+
+        public String getUserName() {
+            if (StrUtil.isNotEmpty(userName)) {
+                return userName + "（" + nickName + "）";
+            }
+            return userName;
+        }
     }
 
 }

research-system/src/main/java/com/research/system/persist/mapper/KtsKtGroupMemberAduitMapper.java

@@ -0,0 +1,28 @@
+package com.research.system.persist.mapper;
+
+import com.research.system.domain.po.KtsKtGroupMemberAduit;
+import com.research.system.domain.po.KtsKtGroupMemberAduitExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface KtsKtGroupMemberAduitMapper {
+    long countByExample(KtsKtGroupMemberAduitExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(KtsKtGroupMemberAduit record);
+
+    int insertSelective(KtsKtGroupMemberAduit record);
+
+    List<KtsKtGroupMemberAduit> selectByExample(KtsKtGroupMemberAduitExample example);
+
+    KtsKtGroupMemberAduit selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") KtsKtGroupMemberAduit record, @Param("example") KtsKtGroupMemberAduitExample example);
+
+    int updateByExample(@Param("record") KtsKtGroupMemberAduit record, @Param("example") KtsKtGroupMemberAduitExample example);
+
+    int updateByPrimaryKeySelective(KtsKtGroupMemberAduit record);
+
+    int updateByPrimaryKey(KtsKtGroupMemberAduit record);
+}

research-system/src/main/java/com/research/system/service/KtsGroupService.java

@@ -5,6 +5,7 @@ import com.research.common.core.domain.JsonResponse;
 import com.research.common.enums.DataSourceType;
 import com.research.system.domain.dto.CommonDto;
 import com.research.system.domain.dto.GroupDto;
+import com.research.system.domain.po.KtsKtGroup;
 import com.research.system.domain.po.KtsKtGroupMember;
 import com.research.system.domain.vo.GroupVO;
 
@@ -21,7 +22,7 @@ public interface KtsGroupService {
 
     List<GroupVO.Result> queryGroupList(GroupDto.Query query);
 
-    void add(GroupDto.Add dto);
+    KtsKtGroup add(GroupDto.Add dto);
 
     void del(CommonDto.DelDto dto);
 

research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java

@@ -1,6 +1,7 @@
 package com.research.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.research.common.constant.UserConstants;
@@ -54,7 +55,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
     }
 
     @Override
-    public void add(GroupDto.Add dto) {
+    public KtsKtGroup add(GroupDto.Add dto) {
         //根据登录账号查询项目
         PrjProjInfo proInfoByTenantId = clientPrjProjInfoService.getProInfoByTenantId(SecurityUtils.getTenantId());
         if (proInfoByTenantId == null) {
@@ -74,6 +75,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
             ktsKtGroup.setUpdateTime(new Date());
             ktsKtGroupMapper.updateByPrimaryKeySelective(ktsKtGroup);
         }
+        return ktsKtGroup;
     }
 
     @Override
@@ -102,6 +104,20 @@ public class KtsGroupServiceImpl implements KtsGroupService {
 
     @Override
     public KtsKtGroupMember addMember(GroupDto.AddMember dto) {
+        //是否传了课题组ID，没传且课题组名称不为空，则添加课题组
+        if (dto.getKtGroupId() == null && StrUtil.isNotEmpty(dto.getKtGroupName())) {
+            GroupDto.Add add = new GroupDto.Add();
+            add.setKtGroupName(dto.getKtGroupName());
+            add.setProjId(dto.getProjId());
+            add.setProjOrgId(dto.getProjOrgId());
+            add.setIntro(dto.getKtGroupIntro());
+            add.setName(dto.getMemberName());
+            add.setPhone(dto.getMemberPhone());
+            add.setParentKtId(dto.getParentKtId());
+            KtsKtGroup add1 = add(add);
+            dto.setKtGroupId(add1.getId());
+        }
+
         KtsKtGroupMember ktsKtGroupMember = BeanUtil.copyProperties(dto, KtsKtGroupMember.class);
         //是否传了用户ID  没传用户id且传了用户名 添加用户
         if (dto.getUserId() == null && StrUtil.isNotEmpty(dto.getUsername())) {
@@ -116,11 +132,14 @@ public class KtsGroupServiceImpl implements KtsGroupService {
             sysUser.setUserName(dto.getUsername());
             sysUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
             sysUser.setStatus(UserConstants.NORMAL);
+            sysUser.setDeptId(dto.getDeptId());
             sysUser.setCreateBy(SecurityUtils.getUsername());
             sysUser.setEmail(ktsKtGroupMember.getMemberEmail());
             sysUser.setPhonenumber(ktsKtGroupMember.getMemberPhone());
             sysUser.setCreateTime(new Date());
+            if (CollUtil.isNotEmpty(dto.getRoleIdList())) {
                 sysUser.setRoleIds(dto.getRoleIdList().toArray(new Long[0]));
+            }
             sysUserService.insertUser(sysUser);
             ktsKtGroupMember.setUserId(sysUser.getUserId());
         } else {

research-system/src/main/resources/mapper/dao/KtsGroupDao.xml

@@ -35,7 +35,7 @@
             and g.kt_group_name like concat('%',#{dto.ktGroupName},'%')
         </if>
         group by g.id
-        order by g.parent_kt_id,g.id desc
+        order by g.parent_kt_id,g.id
     </select>
 
     <select id="queryMemberList" resultType="com.research.system.domain.vo.GroupVO$MemberResult">
@@ -63,7 +63,8 @@
         d1.dict_label as qualificationName,
         d2.dict_label as titleName,
         o.org_name as projOrgName,
-        u.user_name as userName
+        u.user_name as userName,
+        u.nick_name as nickName
         from
         kts_kt_group_member m
         left join
@@ -95,6 +96,6 @@
         <if test="dto.category != null">
             and m.category = #{dto.category}
         </if>
-        order by m.kt_group_id,m.id desc
+        order by m.kt_group_id,m.id
     </select>
 </mapper>

research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml

@@ -0,0 +1,490 @@
+<?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.research.system.persist.mapper.KtsKtGroupMemberAduitMapper">
+  <resultMap id="BaseResultMap" type="com.research.system.domain.po.KtsKtGroupMemberAduit">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="category" jdbcType="BIGINT" property="category" />
+    <result column="dept_id" jdbcType="BIGINT" property="deptId" />
+    <result column="kt_group_intro" jdbcType="VARCHAR" property="ktGroupIntro" />
+    <result column="member_birth" jdbcType="VARCHAR" property="memberBirth" />
+    <result column="member_email" jdbcType="TINYINT" property="memberEmail" />
+    <result column="member_gender" jdbcType="DATE" property="memberGender" />
+    <result column="member_name" jdbcType="TINYINT" property="memberName" />
+    <result column="member_phone" jdbcType="TINYINT" property="memberPhone" />
+    <result column="parent_member_id" jdbcType="INTEGER" property="parentMemberId" />
+    <result column="password" jdbcType="INTEGER" property="password" />
+    <result column="proj_org_id" jdbcType="INTEGER" property="projOrgId" />
+    <result column="role_id_list" jdbcType="VARCHAR" property="roleIdList" />
+    <result column="title" jdbcType="TINYINT" property="title" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="user_id" jdbcType="TINYINT" property="userId" />
+    <result column="username" jdbcType="TINYINT" property="username" />
+    <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, category, dept_id, kt_group_intro, member_birth, member_email, member_gender, 
+    member_name, member_phone, parent_member_id, password, proj_org_id, role_id_list, 
+    title, type, user_id, username, del_flag, create_by, create_time, update_by, update_time, 
+    remark
+  </sql>
+  <select id="selectByExample" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduitExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from kts_kt_group_member_aduit
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from kts_kt_group_member_aduit
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from kts_kt_group_member_aduit
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduit">
+    insert into kts_kt_group_member_aduit (id, category, dept_id, 
+      kt_group_intro, member_birth, member_email, 
+      member_gender, member_name, member_phone, 
+      parent_member_id, password, proj_org_id, 
+      role_id_list, title, type, 
+      user_id, username, del_flag, 
+      create_by, create_time, update_by, 
+      update_time, remark)
+    values (#{id,jdbcType=BIGINT}, #{category,jdbcType=BIGINT}, #{deptId,jdbcType=BIGINT}, 
+      #{ktGroupIntro,jdbcType=VARCHAR}, #{memberBirth,jdbcType=VARCHAR}, #{memberEmail,jdbcType=TINYINT}, 
+      #{memberGender,jdbcType=DATE}, #{memberName,jdbcType=TINYINT}, #{memberPhone,jdbcType=TINYINT}, 
+      #{parentMemberId,jdbcType=INTEGER}, #{password,jdbcType=INTEGER}, #{projOrgId,jdbcType=INTEGER}, 
+      #{roleIdList,jdbcType=VARCHAR}, #{title,jdbcType=TINYINT}, #{type,jdbcType=TINYINT}, 
+      #{userId,jdbcType=TINYINT}, #{username,jdbcType=TINYINT}, #{delFlag,jdbcType=TINYINT}, 
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduit">
+    insert into kts_kt_group_member_aduit
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="category != null">
+        category,
+      </if>
+      <if test="deptId != null">
+        dept_id,
+      </if>
+      <if test="ktGroupIntro != null">
+        kt_group_intro,
+      </if>
+      <if test="memberBirth != null">
+        member_birth,
+      </if>
+      <if test="memberEmail != null">
+        member_email,
+      </if>
+      <if test="memberGender != null">
+        member_gender,
+      </if>
+      <if test="memberName != null">
+        member_name,
+      </if>
+      <if test="memberPhone != null">
+        member_phone,
+      </if>
+      <if test="parentMemberId != null">
+        parent_member_id,
+      </if>
+      <if test="password != null">
+        password,
+      </if>
+      <if test="projOrgId != null">
+        proj_org_id,
+      </if>
+      <if test="roleIdList != null">
+        role_id_list,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="username != null">
+        username,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateBy != null">
+        update_by,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="category != null">
+        #{category,jdbcType=BIGINT},
+      </if>
+      <if test="deptId != null">
+        #{deptId,jdbcType=BIGINT},
+      </if>
+      <if test="ktGroupIntro != null">
+        #{ktGroupIntro,jdbcType=VARCHAR},
+      </if>
+      <if test="memberBirth != null">
+        #{memberBirth,jdbcType=VARCHAR},
+      </if>
+      <if test="memberEmail != null">
+        #{memberEmail,jdbcType=TINYINT},
+      </if>
+      <if test="memberGender != null">
+        #{memberGender,jdbcType=DATE},
+      </if>
+      <if test="memberName != null">
+        #{memberName,jdbcType=TINYINT},
+      </if>
+      <if test="memberPhone != null">
+        #{memberPhone,jdbcType=TINYINT},
+      </if>
+      <if test="parentMemberId != null">
+        #{parentMemberId,jdbcType=INTEGER},
+      </if>
+      <if test="password != null">
+        #{password,jdbcType=INTEGER},
+      </if>
+      <if test="projOrgId != null">
+        #{projOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="roleIdList != null">
+        #{roleIdList,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=TINYINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=TINYINT},
+      </if>
+      <if test="username != null">
+        #{username,jdbcType=TINYINT},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=TINYINT},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduitExample" resultType="java.lang.Long">
+    select count(*) from kts_kt_group_member_aduit
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update kts_kt_group_member_aduit
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.category != null">
+        category = #{record.category,jdbcType=BIGINT},
+      </if>
+      <if test="record.deptId != null">
+        dept_id = #{record.deptId,jdbcType=BIGINT},
+      </if>
+      <if test="record.ktGroupIntro != null">
+        kt_group_intro = #{record.ktGroupIntro,jdbcType=VARCHAR},
+      </if>
+      <if test="record.memberBirth != null">
+        member_birth = #{record.memberBirth,jdbcType=VARCHAR},
+      </if>
+      <if test="record.memberEmail != null">
+        member_email = #{record.memberEmail,jdbcType=TINYINT},
+      </if>
+      <if test="record.memberGender != null">
+        member_gender = #{record.memberGender,jdbcType=DATE},
+      </if>
+      <if test="record.memberName != null">
+        member_name = #{record.memberName,jdbcType=TINYINT},
+      </if>
+      <if test="record.memberPhone != null">
+        member_phone = #{record.memberPhone,jdbcType=TINYINT},
+      </if>
+      <if test="record.parentMemberId != null">
+        parent_member_id = #{record.parentMemberId,jdbcType=INTEGER},
+      </if>
+      <if test="record.password != null">
+        password = #{record.password,jdbcType=INTEGER},
+      </if>
+      <if test="record.projOrgId != null">
+        proj_org_id = #{record.projOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.roleIdList != null">
+        role_id_list = #{record.roleIdList,jdbcType=VARCHAR},
+      </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=TINYINT},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=TINYINT},
+      </if>
+      <if test="record.username != null">
+        username = #{record.username,jdbcType=TINYINT},
+      </if>
+      <if test="record.delFlag != null">
+        del_flag = #{record.delFlag,jdbcType=TINYINT},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateBy != null">
+        update_by = #{record.updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update kts_kt_group_member_aduit
+    set id = #{record.id,jdbcType=BIGINT},
+      category = #{record.category,jdbcType=BIGINT},
+      dept_id = #{record.deptId,jdbcType=BIGINT},
+      kt_group_intro = #{record.ktGroupIntro,jdbcType=VARCHAR},
+      member_birth = #{record.memberBirth,jdbcType=VARCHAR},
+      member_email = #{record.memberEmail,jdbcType=TINYINT},
+      member_gender = #{record.memberGender,jdbcType=DATE},
+      member_name = #{record.memberName,jdbcType=TINYINT},
+      member_phone = #{record.memberPhone,jdbcType=TINYINT},
+      parent_member_id = #{record.parentMemberId,jdbcType=INTEGER},
+      password = #{record.password,jdbcType=INTEGER},
+      proj_org_id = #{record.projOrgId,jdbcType=INTEGER},
+      role_id_list = #{record.roleIdList,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=TINYINT},
+      type = #{record.type,jdbcType=TINYINT},
+      user_id = #{record.userId,jdbcType=TINYINT},
+      username = #{record.username,jdbcType=TINYINT},
+      del_flag = #{record.delFlag,jdbcType=TINYINT},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      remark = #{record.remark,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduit">
+    update kts_kt_group_member_aduit
+    <set>
+      <if test="category != null">
+        category = #{category,jdbcType=BIGINT},
+      </if>
+      <if test="deptId != null">
+        dept_id = #{deptId,jdbcType=BIGINT},
+      </if>
+      <if test="ktGroupIntro != null">
+        kt_group_intro = #{ktGroupIntro,jdbcType=VARCHAR},
+      </if>
+      <if test="memberBirth != null">
+        member_birth = #{memberBirth,jdbcType=VARCHAR},
+      </if>
+      <if test="memberEmail != null">
+        member_email = #{memberEmail,jdbcType=TINYINT},
+      </if>
+      <if test="memberGender != null">
+        member_gender = #{memberGender,jdbcType=DATE},
+      </if>
+      <if test="memberName != null">
+        member_name = #{memberName,jdbcType=TINYINT},
+      </if>
+      <if test="memberPhone != null">
+        member_phone = #{memberPhone,jdbcType=TINYINT},
+      </if>
+      <if test="parentMemberId != null">
+        parent_member_id = #{parentMemberId,jdbcType=INTEGER},
+      </if>
+      <if test="password != null">
+        password = #{password,jdbcType=INTEGER},
+      </if>
+      <if test="projOrgId != null">
+        proj_org_id = #{projOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="roleIdList != null">
+        role_id_list = #{roleIdList,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=TINYINT},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=TINYINT},
+      </if>
+      <if test="username != null">
+        username = #{username,jdbcType=TINYINT},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=TINYINT},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        update_by = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.research.system.domain.po.KtsKtGroupMemberAduit">
+    update kts_kt_group_member_aduit
+    set category = #{category,jdbcType=BIGINT},
+      dept_id = #{deptId,jdbcType=BIGINT},
+      kt_group_intro = #{ktGroupIntro,jdbcType=VARCHAR},
+      member_birth = #{memberBirth,jdbcType=VARCHAR},
+      member_email = #{memberEmail,jdbcType=TINYINT},
+      member_gender = #{memberGender,jdbcType=DATE},
+      member_name = #{memberName,jdbcType=TINYINT},
+      member_phone = #{memberPhone,jdbcType=TINYINT},
+      parent_member_id = #{parentMemberId,jdbcType=INTEGER},
+      password = #{password,jdbcType=INTEGER},
+      proj_org_id = #{projOrgId,jdbcType=INTEGER},
+      role_id_list = #{roleIdList,jdbcType=VARCHAR},
+      title = #{title,jdbcType=TINYINT},
+      type = #{type,jdbcType=TINYINT},
+      user_id = #{userId,jdbcType=TINYINT},
+      username = #{username,jdbcType=TINYINT},
+      del_flag = #{delFlag,jdbcType=TINYINT},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      remark = #{remark,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>