diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java index f7896168..076511a2 100644 --- a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java +++ b/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> queryGroupList(@RequestBody @Validated BaseDto query){ if (query.getPageNum() > 0) { @@ -100,6 +102,8 @@ public class GroupController { ktsGroupService.status(dto); return JsonResponse.ok(); } + + @Anonymous @PostMapping("/member/query") public JsonResponse> queryMemberList(@RequestBody @Validated BaseDto 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 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(); } diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/MemberAduitController.java b/research-admin/src/main/java/com/research/web/controller/client/project/MemberAduitController.java new file mode 100644 index 00000000..bef66f63 --- /dev/null +++ b/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 { +} diff --git a/research-admin/src/main/java/com/research/web/controller/system/SysDeptController.java b/research-admin/src/main/java/com/research/web/controller/system/SysDeptController.java index 07dcda14..5e322148 100644 --- a/research-admin/src/main/java/com/research/web/controller/system/SysDeptController.java +++ b/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) { diff --git a/research-admin/src/main/java/com/research/web/controller/system/SysDictDataController.java b/research-admin/src/main/java/com/research/web/controller/system/SysDictDataController.java index 17b9ebc5..9f97f850 100644 --- a/research-admin/src/main/java/com/research/web/controller/system/SysDictDataController.java +++ b/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) { diff --git a/research-common/src/main/java/com/research/common/core/controller/BaseController.java b/research-common/src/main/java/com/research/common/core/controller/BaseController.java index dac3ff46..c1214691 100644 --- a/research-common/src/main/java/com/research/common/core/controller/BaseController.java +++ b/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(); } } diff --git a/research-common/src/main/java/com/research/common/utils/SecurityUtils.java b/research-common/src/main/java/com/research/common/utils/SecurityUtils.java index e4a07230..5784d479 100644 --- a/research-common/src/main/java/com/research/common/utils/SecurityUtils.java +++ b/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 */ diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml index 0e8fe468..e1476e34 100644 --- a/research-generator/src/main/resources/mbg.xml +++ b/research-generator/src/main/resources/mbg.xml @@ -62,7 +62,6 @@ - @@ -73,6 +72,7 @@ +
diff --git a/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java b/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java index 59558c54..e33aafa9 100644 --- a/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java +++ b/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; } } diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduit.java new file mode 100644 index 00000000..bf2b6834 --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java new file mode 100644 index 00000000..f999fa14 --- /dev/null +++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupMemberAduitExample.java @@ -0,0 +1,1668 @@ +package com.research.system.domain.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.List; + +public class KtsKtGroupMemberAduitExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public KtsKtGroupMemberAduitExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + protected void addCriterionForJDBCDate(String condition, Date value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + addCriterion(condition, new java.sql.Date(value.getTime()), property); + } + + protected void addCriterionForJDBCDate(String condition, List values, String property) { + if (values == null || values.size() == 0) { + throw new RuntimeException("Value list for " + property + " cannot be null or empty"); + } + List dateList = new ArrayList(); + Iterator iter = values.iterator(); + while (iter.hasNext()) { + dateList.add(new java.sql.Date(iter.next().getTime())); + } + addCriterion(condition, dateList, property); + } + + protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCategoryIsNull() { + addCriterion("category is null"); + return (Criteria) this; + } + + public Criteria andCategoryIsNotNull() { + addCriterion("category is not null"); + return (Criteria) this; + } + + public Criteria andCategoryEqualTo(Long value) { + addCriterion("category =", value, "category"); + return (Criteria) this; + } + + public Criteria andCategoryNotEqualTo(Long value) { + addCriterion("category <>", value, "category"); + return (Criteria) this; + } + + public Criteria andCategoryGreaterThan(Long value) { + addCriterion("category >", value, "category"); + return (Criteria) this; + } + + public Criteria andCategoryGreaterThanOrEqualTo(Long value) { + addCriterion("category >=", value, "category"); + return (Criteria) this; + } + + public Criteria andCategoryLessThan(Long value) { + addCriterion("category <", value, "category"); + return (Criteria) this; + } + + public Criteria andCategoryLessThanOrEqualTo(Long value) { + addCriterion("category <=", value, "category"); + return (Criteria) this; + } + + public Criteria andCategoryIn(List values) { + addCriterion("category in", values, "category"); + return (Criteria) this; + } + + public Criteria andCategoryNotIn(List values) { + addCriterion("category not in", values, "category"); + return (Criteria) this; + } + + public Criteria andCategoryBetween(Long value1, Long value2) { + addCriterion("category between", value1, value2, "category"); + return (Criteria) this; + } + + public Criteria andCategoryNotBetween(Long value1, Long value2) { + addCriterion("category not between", value1, value2, "category"); + return (Criteria) this; + } + + public Criteria andDeptIdIsNull() { + addCriterion("dept_id is null"); + return (Criteria) this; + } + + public Criteria andDeptIdIsNotNull() { + addCriterion("dept_id is not null"); + return (Criteria) this; + } + + public Criteria andDeptIdEqualTo(Long value) { + addCriterion("dept_id =", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotEqualTo(Long value) { + addCriterion("dept_id <>", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdGreaterThan(Long value) { + addCriterion("dept_id >", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdGreaterThanOrEqualTo(Long value) { + addCriterion("dept_id >=", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdLessThan(Long value) { + addCriterion("dept_id <", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdLessThanOrEqualTo(Long value) { + addCriterion("dept_id <=", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdIn(List values) { + addCriterion("dept_id in", values, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotIn(List values) { + addCriterion("dept_id not in", values, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdBetween(Long value1, Long value2) { + addCriterion("dept_id between", value1, value2, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotBetween(Long value1, Long value2) { + addCriterion("dept_id not between", value1, value2, "deptId"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroIsNull() { + addCriterion("kt_group_intro is null"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroIsNotNull() { + addCriterion("kt_group_intro is not null"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroEqualTo(String value) { + addCriterion("kt_group_intro =", value, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroNotEqualTo(String value) { + addCriterion("kt_group_intro <>", value, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroGreaterThan(String value) { + addCriterion("kt_group_intro >", value, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroGreaterThanOrEqualTo(String value) { + addCriterion("kt_group_intro >=", value, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroLessThan(String value) { + addCriterion("kt_group_intro <", value, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroLessThanOrEqualTo(String value) { + addCriterion("kt_group_intro <=", value, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroLike(String value) { + addCriterion("kt_group_intro like", value, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroNotLike(String value) { + addCriterion("kt_group_intro not like", value, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroIn(List values) { + addCriterion("kt_group_intro in", values, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroNotIn(List values) { + addCriterion("kt_group_intro not in", values, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroBetween(String value1, String value2) { + addCriterion("kt_group_intro between", value1, value2, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andKtGroupIntroNotBetween(String value1, String value2) { + addCriterion("kt_group_intro not between", value1, value2, "ktGroupIntro"); + return (Criteria) this; + } + + public Criteria andMemberBirthIsNull() { + addCriterion("member_birth is null"); + return (Criteria) this; + } + + public Criteria andMemberBirthIsNotNull() { + addCriterion("member_birth is not null"); + return (Criteria) this; + } + + public Criteria andMemberBirthEqualTo(String value) { + addCriterion("member_birth =", value, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthNotEqualTo(String value) { + addCriterion("member_birth <>", value, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthGreaterThan(String value) { + addCriterion("member_birth >", value, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthGreaterThanOrEqualTo(String value) { + addCriterion("member_birth >=", value, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthLessThan(String value) { + addCriterion("member_birth <", value, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthLessThanOrEqualTo(String value) { + addCriterion("member_birth <=", value, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthLike(String value) { + addCriterion("member_birth like", value, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthNotLike(String value) { + addCriterion("member_birth not like", value, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthIn(List values) { + addCriterion("member_birth in", values, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthNotIn(List values) { + addCriterion("member_birth not in", values, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthBetween(String value1, String value2) { + addCriterion("member_birth between", value1, value2, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberBirthNotBetween(String value1, String value2) { + addCriterion("member_birth not between", value1, value2, "memberBirth"); + return (Criteria) this; + } + + public Criteria andMemberEmailIsNull() { + addCriterion("member_email is null"); + return (Criteria) this; + } + + public Criteria andMemberEmailIsNotNull() { + addCriterion("member_email is not null"); + return (Criteria) this; + } + + public Criteria andMemberEmailEqualTo(Byte value) { + addCriterion("member_email =", value, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailNotEqualTo(Byte value) { + addCriterion("member_email <>", value, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailGreaterThan(Byte value) { + addCriterion("member_email >", value, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailGreaterThanOrEqualTo(Byte value) { + addCriterion("member_email >=", value, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailLessThan(Byte value) { + addCriterion("member_email <", value, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailLessThanOrEqualTo(Byte value) { + addCriterion("member_email <=", value, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailIn(List values) { + addCriterion("member_email in", values, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailNotIn(List values) { + addCriterion("member_email not in", values, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailBetween(Byte value1, Byte value2) { + addCriterion("member_email between", value1, value2, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberEmailNotBetween(Byte value1, Byte value2) { + addCriterion("member_email not between", value1, value2, "memberEmail"); + return (Criteria) this; + } + + public Criteria andMemberGenderIsNull() { + addCriterion("member_gender is null"); + return (Criteria) this; + } + + public Criteria andMemberGenderIsNotNull() { + addCriterion("member_gender is not null"); + return (Criteria) this; + } + + public Criteria andMemberGenderEqualTo(Date value) { + addCriterionForJDBCDate("member_gender =", value, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderNotEqualTo(Date value) { + addCriterionForJDBCDate("member_gender <>", value, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderGreaterThan(Date value) { + addCriterionForJDBCDate("member_gender >", value, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderGreaterThanOrEqualTo(Date value) { + addCriterionForJDBCDate("member_gender >=", value, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderLessThan(Date value) { + addCriterionForJDBCDate("member_gender <", value, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderLessThanOrEqualTo(Date value) { + addCriterionForJDBCDate("member_gender <=", value, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderIn(List values) { + addCriterionForJDBCDate("member_gender in", values, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderNotIn(List values) { + addCriterionForJDBCDate("member_gender not in", values, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderBetween(Date value1, Date value2) { + addCriterionForJDBCDate("member_gender between", value1, value2, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberGenderNotBetween(Date value1, Date value2) { + addCriterionForJDBCDate("member_gender not between", value1, value2, "memberGender"); + return (Criteria) this; + } + + public Criteria andMemberNameIsNull() { + addCriterion("member_name is null"); + return (Criteria) this; + } + + public Criteria andMemberNameIsNotNull() { + addCriterion("member_name is not null"); + return (Criteria) this; + } + + public Criteria andMemberNameEqualTo(Byte value) { + addCriterion("member_name =", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameNotEqualTo(Byte value) { + addCriterion("member_name <>", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameGreaterThan(Byte value) { + addCriterion("member_name >", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameGreaterThanOrEqualTo(Byte value) { + addCriterion("member_name >=", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameLessThan(Byte value) { + addCriterion("member_name <", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameLessThanOrEqualTo(Byte value) { + addCriterion("member_name <=", value, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameIn(List values) { + addCriterion("member_name in", values, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameNotIn(List values) { + addCriterion("member_name not in", values, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameBetween(Byte value1, Byte value2) { + addCriterion("member_name between", value1, value2, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberNameNotBetween(Byte value1, Byte value2) { + addCriterion("member_name not between", value1, value2, "memberName"); + return (Criteria) this; + } + + public Criteria andMemberPhoneIsNull() { + addCriterion("member_phone is null"); + return (Criteria) this; + } + + public Criteria andMemberPhoneIsNotNull() { + addCriterion("member_phone is not null"); + return (Criteria) this; + } + + public Criteria andMemberPhoneEqualTo(Byte value) { + addCriterion("member_phone =", value, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneNotEqualTo(Byte value) { + addCriterion("member_phone <>", value, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneGreaterThan(Byte value) { + addCriterion("member_phone >", value, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneGreaterThanOrEqualTo(Byte value) { + addCriterion("member_phone >=", value, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneLessThan(Byte value) { + addCriterion("member_phone <", value, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneLessThanOrEqualTo(Byte value) { + addCriterion("member_phone <=", value, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneIn(List values) { + addCriterion("member_phone in", values, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneNotIn(List values) { + addCriterion("member_phone not in", values, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneBetween(Byte value1, Byte value2) { + addCriterion("member_phone between", value1, value2, "memberPhone"); + return (Criteria) this; + } + + public Criteria andMemberPhoneNotBetween(Byte value1, Byte value2) { + addCriterion("member_phone not between", value1, value2, "memberPhone"); + return (Criteria) this; + } + + public Criteria andParentMemberIdIsNull() { + addCriterion("parent_member_id is null"); + return (Criteria) this; + } + + public Criteria andParentMemberIdIsNotNull() { + addCriterion("parent_member_id is not null"); + return (Criteria) this; + } + + public Criteria andParentMemberIdEqualTo(Integer value) { + addCriterion("parent_member_id =", value, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdNotEqualTo(Integer value) { + addCriterion("parent_member_id <>", value, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdGreaterThan(Integer value) { + addCriterion("parent_member_id >", value, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdGreaterThanOrEqualTo(Integer value) { + addCriterion("parent_member_id >=", value, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdLessThan(Integer value) { + addCriterion("parent_member_id <", value, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdLessThanOrEqualTo(Integer value) { + addCriterion("parent_member_id <=", value, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdIn(List values) { + addCriterion("parent_member_id in", values, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdNotIn(List values) { + addCriterion("parent_member_id not in", values, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdBetween(Integer value1, Integer value2) { + addCriterion("parent_member_id between", value1, value2, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andParentMemberIdNotBetween(Integer value1, Integer value2) { + addCriterion("parent_member_id not between", value1, value2, "parentMemberId"); + return (Criteria) this; + } + + public Criteria andPasswordIsNull() { + addCriterion("password is null"); + return (Criteria) this; + } + + public Criteria andPasswordIsNotNull() { + addCriterion("password is not null"); + return (Criteria) this; + } + + public Criteria andPasswordEqualTo(Integer value) { + addCriterion("password =", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotEqualTo(Integer value) { + addCriterion("password <>", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThan(Integer value) { + addCriterion("password >", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThanOrEqualTo(Integer value) { + addCriterion("password >=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThan(Integer value) { + addCriterion("password <", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThanOrEqualTo(Integer value) { + addCriterion("password <=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordIn(List values) { + addCriterion("password in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotIn(List values) { + addCriterion("password not in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordBetween(Integer value1, Integer value2) { + addCriterion("password between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotBetween(Integer value1, Integer value2) { + addCriterion("password not between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andProjOrgIdIsNull() { + addCriterion("proj_org_id is null"); + return (Criteria) this; + } + + public Criteria andProjOrgIdIsNotNull() { + addCriterion("proj_org_id is not null"); + return (Criteria) this; + } + + public Criteria andProjOrgIdEqualTo(Integer value) { + addCriterion("proj_org_id =", value, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdNotEqualTo(Integer value) { + addCriterion("proj_org_id <>", value, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdGreaterThan(Integer value) { + addCriterion("proj_org_id >", value, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdGreaterThanOrEqualTo(Integer value) { + addCriterion("proj_org_id >=", value, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdLessThan(Integer value) { + addCriterion("proj_org_id <", value, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdLessThanOrEqualTo(Integer value) { + addCriterion("proj_org_id <=", value, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdIn(List values) { + addCriterion("proj_org_id in", values, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdNotIn(List values) { + addCriterion("proj_org_id not in", values, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdBetween(Integer value1, Integer value2) { + addCriterion("proj_org_id between", value1, value2, "projOrgId"); + return (Criteria) this; + } + + public Criteria andProjOrgIdNotBetween(Integer value1, Integer value2) { + addCriterion("proj_org_id not between", value1, value2, "projOrgId"); + return (Criteria) this; + } + + public Criteria andRoleIdListIsNull() { + addCriterion("role_id_list is null"); + return (Criteria) this; + } + + public Criteria andRoleIdListIsNotNull() { + addCriterion("role_id_list is not null"); + return (Criteria) this; + } + + public Criteria andRoleIdListEqualTo(String value) { + addCriterion("role_id_list =", value, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListNotEqualTo(String value) { + addCriterion("role_id_list <>", value, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListGreaterThan(String value) { + addCriterion("role_id_list >", value, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListGreaterThanOrEqualTo(String value) { + addCriterion("role_id_list >=", value, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListLessThan(String value) { + addCriterion("role_id_list <", value, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListLessThanOrEqualTo(String value) { + addCriterion("role_id_list <=", value, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListLike(String value) { + addCriterion("role_id_list like", value, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListNotLike(String value) { + addCriterion("role_id_list not like", value, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListIn(List values) { + addCriterion("role_id_list in", values, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListNotIn(List values) { + addCriterion("role_id_list not in", values, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListBetween(String value1, String value2) { + addCriterion("role_id_list between", value1, value2, "roleIdList"); + return (Criteria) this; + } + + public Criteria andRoleIdListNotBetween(String value1, String value2) { + addCriterion("role_id_list not between", value1, value2, "roleIdList"); + return (Criteria) this; + } + + public Criteria andTitleIsNull() { + addCriterion("title is null"); + return (Criteria) this; + } + + public Criteria andTitleIsNotNull() { + addCriterion("title is not null"); + return (Criteria) this; + } + + public Criteria andTitleEqualTo(Byte value) { + addCriterion("title =", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotEqualTo(Byte value) { + addCriterion("title <>", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThan(Byte value) { + addCriterion("title >", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThanOrEqualTo(Byte value) { + addCriterion("title >=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThan(Byte value) { + addCriterion("title <", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThanOrEqualTo(Byte value) { + addCriterion("title <=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleIn(List values) { + addCriterion("title in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotIn(List values) { + addCriterion("title not in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleBetween(Byte value1, Byte value2) { + addCriterion("title between", value1, value2, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotBetween(Byte value1, Byte value2) { + addCriterion("title not between", value1, value2, "title"); + return (Criteria) this; + } + + public Criteria andTypeIsNull() { + addCriterion("type is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("type is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Byte value) { + addCriterion("type =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Byte value) { + addCriterion("type <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Byte value) { + addCriterion("type >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("type >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Byte value) { + addCriterion("type <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Byte value) { + addCriterion("type <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("type not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Byte value1, Byte value2) { + addCriterion("type between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Byte value1, Byte value2) { + addCriterion("type not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Byte value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Byte value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Byte value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Byte value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Byte value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Byte value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Byte value1, Byte value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Byte value1, Byte value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUsernameIsNull() { + addCriterion("username is null"); + return (Criteria) this; + } + + public Criteria andUsernameIsNotNull() { + addCriterion("username is not null"); + return (Criteria) this; + } + + public Criteria andUsernameEqualTo(Byte value) { + addCriterion("username =", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotEqualTo(Byte value) { + addCriterion("username <>", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameGreaterThan(Byte value) { + addCriterion("username >", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameGreaterThanOrEqualTo(Byte value) { + addCriterion("username >=", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLessThan(Byte value) { + addCriterion("username <", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLessThanOrEqualTo(Byte value) { + addCriterion("username <=", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameIn(List values) { + addCriterion("username in", values, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotIn(List values) { + addCriterion("username not in", values, "username"); + return (Criteria) this; + } + + public Criteria andUsernameBetween(Byte value1, Byte value2) { + addCriterion("username between", value1, value2, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotBetween(Byte value1, Byte value2) { + addCriterion("username not between", value1, value2, "username"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(Byte value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(Byte value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(Byte value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(Byte value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(Byte value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(Byte value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(Byte value1, Byte value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(Byte value1, Byte value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java index 05dea5cb..455b1114 100644 --- a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java +++ b/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; + } } } diff --git a/research-system/src/main/java/com/research/system/persist/mapper/KtsKtGroupMemberAduitMapper.java b/research-system/src/main/java/com/research/system/persist/mapper/KtsKtGroupMemberAduitMapper.java new file mode 100644 index 00000000..21e206cf --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/research-system/src/main/java/com/research/system/service/KtsGroupService.java b/research-system/src/main/java/com/research/system/service/KtsGroupService.java index 1ddf50cb..e4a9910c 100644 --- a/research-system/src/main/java/com/research/system/service/KtsGroupService.java +++ b/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 queryGroupList(GroupDto.Query query); - void add(GroupDto.Add dto); + KtsKtGroup add(GroupDto.Add dto); void del(CommonDto.DelDto dto); diff --git a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java index 90f52c62..e40e5c79 100644 --- a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java +++ b/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()); - sysUser.setRoleIds(dto.getRoleIdList().toArray(new Long[0])); + if (CollUtil.isNotEmpty(dto.getRoleIdList())) { + sysUser.setRoleIds(dto.getRoleIdList().toArray(new Long[0])); + } sysUserService.insertUser(sysUser); ktsKtGroupMember.setUserId(sysUser.getUserId()); } else { diff --git a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml index 5d4d87e2..6e5db09d 100644 --- a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml +++ b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml @@ -35,7 +35,7 @@ and g.kt_group_name like concat('%',#{dto.ktGroupName},'%') group by g.id - order by g.parent_kt_id,g.id desc + order by g.parent_kt_id,g.id diff --git a/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml b/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml new file mode 100644 index 00000000..2873f13a --- /dev/null +++ b/research-system/src/main/resources/mapper/system/KtsKtGroupMemberAduitMapper.xml @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + 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 + + + + + delete from kts_kt_group_member_aduit + where id = #{id,jdbcType=BIGINT} + + + 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 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, + + + + + #{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}, + + + + + + update kts_kt_group_member_aduit + + + 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}, + + + + + + + + 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} + + + + + + update kts_kt_group_member_aduit + + + 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 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} + + \ No newline at end of file