diff --git a/src/main/java/com/jsh/erp/controller/FunctionsController.java b/src/main/java/com/jsh/erp/controller/FunctionsController.java
index 1f93f209..f524664d 100644
--- a/src/main/java/com/jsh/erp/controller/FunctionsController.java
+++ b/src/main/java/com/jsh/erp/controller/FunctionsController.java
@@ -1,330 +1,330 @@
-package com.jsh.erp.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.jsh.erp.constants.ExceptionConstants;
-import com.jsh.erp.datasource.entities.Functions;
-import com.jsh.erp.datasource.entities.User;
-import com.jsh.erp.exception.BusinessRunTimeException;
-import com.jsh.erp.service.functions.FunctionsService;
-import com.jsh.erp.service.userBusiness.UserBusinessService;
-import com.jsh.erp.utils.BaseResponseInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.dao.DataAccessException;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author ji-sheng-hua 华夏ERP
- */
-@RestController
-@RequestMapping(value = "/functions")
-public class FunctionsController {
- private Logger logger = LoggerFactory.getLogger(FunctionsController.class);
-
- @Resource
- private FunctionsService functionsService;
-
- @Resource
- private UserBusinessService userBusinessService;
-
- @PostMapping(value = "/findMenu")
- public JSONArray findMenu(@RequestParam(value="pNumber") String pNumber,
- @RequestParam(value="hasFunctions") String hasFunctions,
- HttpServletRequest request)throws Exception {
- //存放数据json数组
- JSONArray dataArray = new JSONArray();
- try {
- String fc = hasFunctions; //当前用户所拥有的功能列表，格式如：[1][2][5]
- List
dataList = functionsService.getRoleFunctions(pNumber);
- if (null != dataList) {
- for (Functions functions : dataList) {
- JSONObject item = new JSONObject();
- item.put("id", functions.getId());
- List dataList1 = functionsService.getRoleFunctions(functions.getNumber());
- JSONArray dataArray1 = new JSONArray();
- if (dataList1.size() != 0) {
- item.put("text", functions.getName()); //是目录就没链接
- item.put("icon", functions.getIcon());
- for (Functions functions1 : dataList1) {
- item.put("state", "open"); //如果不为空，节点展开
- JSONObject item1 = new JSONObject();
- List dataList2 = functionsService.getRoleFunctions(functions1.getNumber());
- if (fc.indexOf("[" + functions1.getId().toString() + "]") != -1 || dataList2.size() != 0) {
- item1.put("id", functions1.getId());
- JSONArray dataArray2 = new JSONArray();
- if (dataList2.size() != 0) {
- item1.put("text", functions1.getName());//是目录就没链接
- item1.put("icon", functions1.getIcon());
- for (Functions functions2 : dataList2) {
- item1.put("state", "closed"); //如果不为空，节点不展开
- JSONObject item2 = new JSONObject();
- List dataList3 = functionsService.getRoleFunctions(functions2.getNumber());
- if (fc.indexOf("[" + functions2.getId().toString() + "]") != -1 || dataList3.size() != 0) {
- item2.put("id", functions2.getId());
- JSONArray dataArray3 = new JSONArray();
- if (dataList3.size() != 0) {
- item2.put("text", functions2.getName());//是目录就没链接
- item2.put("icon", functions2.getIcon());
- for (Functions functions3 : dataList3) {
- item2.put("state", "closed"); //如果不为空，节点不展开
- JSONObject item3 = new JSONObject();
- item3.put("id", functions3.getId());
- item3.put("text", functions3.getName());
- item3.put("icon", functions3.getIcon());
- //
- dataArray3.add(item3);
- item2.put("children", dataArray3);
- }
- } else {
- //不是目录，有链接
- item2.put("text", functions2.getName());
- item2.put("icon", functions2.getIcon());
- item2.put("url", functions2.getUrl());
- dataArray2.add(item2);
- item1.put("children", dataArray2);
- }
- } else {
- //不是目录，有链接
- }
- }
- } else {
- //不是目录，有链接
- item1.put("text", functions1.getName());
- item1.put("icon", functions1.getIcon());
- item1.put("url", functions1.getUrl());
- dataArray1.add(item1);
- item.put("children", dataArray1);
- }
- } else {
- //不是目录，有链接
- }
- }
- } else {
- //不是目录，有链接
- item.put("text", functions.getName());
- item.put("icon", functions.getIcon());
- item.put("url", functions.getUrl());
- }
- dataArray.add(item);
- }
- }
- } catch (DataAccessException e) {
- logger.error(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
- }
- return dataArray;
- }
-
- /**
- * 角色对应功能显示
- * @param request
- * @return
- */
- @PostMapping(value = "/findRoleFunctions")
- public JSONArray findRoleFunctions(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
- HttpServletRequest request)throws Exception {
- JSONArray arr = new JSONArray();
- try {
- List dataListFun = functionsService.findRoleFunctions("0");
- //开始拼接json数据
- JSONObject outer = new JSONObject();
- outer.put("id", 1);
- outer.put("text", "功能列表");
- outer.put("state", "open");
- //存放数据json数组
- JSONArray dataArray = new JSONArray();
- if (null != dataListFun) {
- //根据条件从列表里面移除"系统管理"
- List dataList = new ArrayList();
- for (Functions fun : dataListFun) {
- //从session中获取租户id
- String loginName = null;
- Object userInfo = request.getSession().getAttribute("user");
- if(userInfo != null) {
- User user = (User) userInfo;
- loginName = user.getLoginame();
- }
- if(("admin").equals(loginName)) {
- dataList.add(fun);
- } else {
- if(!("系统管理").equals(fun.getName())) {
- dataList.add(fun);
- }
- }
- }
-
- //筛选功能列表
- for (Functions functions : dataList) {
- JSONObject item = new JSONObject();
- item.put("id", functions.getId());
- item.put("text", functions.getName());
-
- //勾选判断1
- Boolean flag = false;
- try {
- flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions.getId().toString() + "]");
- } catch (Exception e) {
- logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
- }
- if (flag == true) {
- item.put("checked", true);
- }
- //结束
-
- List dataList1 = functionsService.findRoleFunctions(functions.getNumber());
- JSONArray dataArray1 = new JSONArray();
- if (null != dataList1) {
-
- for (Functions functions1 : dataList1) {
- item.put("state", "open"); //如果不为空，节点不展开
- JSONObject item1 = new JSONObject();
- item1.put("id", functions1.getId());
- item1.put("text", functions1.getName());
-
- //勾选判断2
- //Boolean flag = false;
- try {
- flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions1.getId().toString() + "]");
- } catch (Exception e) {
- logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
- }
- if (flag == true) {
- item1.put("checked", true);
- }
- //结束
-
- List dataList2 = functionsService.findRoleFunctions(functions1.getNumber());
- JSONArray dataArray2 = new JSONArray();
- if (null != dataList2) {
-
- for (Functions functions2 : dataList2) {
- item1.put("state", "closed"); //如果不为空，节点不展开
- JSONObject item2 = new JSONObject();
- item2.put("id", functions2.getId());
- item2.put("text", functions2.getName());
-
- //勾选判断3
- //Boolean flag = false;
- try {
- flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions2.getId().toString() + "]");
- } catch (Exception e) {
- logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
- }
- if (flag == true) {
- item2.put("checked", true);
- }
- //结束
-
- List dataList3 = functionsService.findRoleFunctions(functions2.getNumber());
- JSONArray dataArray3 = new JSONArray();
- if (null != dataList3) {
-
- for (Functions functions3 : dataList3) {
- item2.put("state", "closed"); //如果不为空，节点不展开
- JSONObject item3 = new JSONObject();
- item3.put("id", functions3.getId());
- item3.put("text", functions3.getName());
-
- //勾选判断4
- //Boolean flag = false;
- try {
- flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions3.getId().toString() + "]");
- } catch (Exception e) {
- logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
- }
- if (flag == true) {
- item3.put("checked", true);
- }
- //结束
-
- dataArray3.add(item3);
- item2.put("children", dataArray3);
- }
- }
-
- dataArray2.add(item2);
- item1.put("children", dataArray2);
- }
- }
-
- dataArray1.add(item1);
- item.put("children", dataArray1);
- }
-
- }
- dataArray.add(item);
- }
- outer.put("children", dataArray);
- arr.add(outer);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return arr;
- }
-
- /**
- * 根据id列表查找功能信息
- * @param functionsIds
- * @param request
- * @return
- */
- @GetMapping(value = "/findByIds")
- public BaseResponseInfo findByIds(@RequestParam("functionsIds") String functionsIds,
- HttpServletRequest request)throws Exception {
- BaseResponseInfo res = new BaseResponseInfo();
- try {
- List dataList = functionsService.findByIds(functionsIds);
- JSONObject outer = new JSONObject();
- outer.put("total", dataList.size());
- //存放数据json数组
- JSONArray dataArray = new JSONArray();
- if (null != dataList) {
- for (Functions functions : dataList) {
- JSONObject item = new JSONObject();
- item.put("Id", functions.getId());
- item.put("Name", functions.getName());
- item.put("PushBtn", functions.getPushbtn());
- item.put("op", 1);
- dataArray.add(item);
- }
- }
- outer.put("rows", dataArray);
- res.code = 200;
- res.data = outer;
- } catch (Exception e) {
- e.printStackTrace();
- res.code = 500;
- res.data = "获取数据失败";
- }
- return res;
- }
- /**
- * create by: qiankunpingtai
- * website：https://qiankunpingtai.cn
- * description:
- * 批量删除功能模块信息
- * create time: 2019/3/29 11:15
- * @Param: ids
- * @return java.lang.Object
- */
- @RequestMapping(value = "/batchDeleteFunctionsByIds")
- public Object batchDeleteFunctionsByIds(@RequestParam("ids") String ids) throws Exception {
- JSONObject result = ExceptionConstants.standardSuccess();
- int i= functionsService.batchDeleteFunctionsByIds(ids);
- if(i<1){
- logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
- ExceptionConstants.FUNCTIONS_DELETE_FAILED_CODE,ExceptionConstants.FUNCTIONS_DELETE_FAILED_MSG,ids);
- throw new BusinessRunTimeException(ExceptionConstants.FUNCTIONS_DELETE_FAILED_CODE,
- ExceptionConstants.FUNCTIONS_DELETE_FAILED_MSG);
- }
- return result;
- }
-}
+package com.jsh.erp.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jsh.erp.constants.ExceptionConstants;
+import com.jsh.erp.datasource.entities.Functions;
+import com.jsh.erp.datasource.entities.User;
+import com.jsh.erp.exception.BusinessRunTimeException;
+import com.jsh.erp.service.functions.FunctionsService;
+import com.jsh.erp.service.userBusiness.UserBusinessService;
+import com.jsh.erp.utils.BaseResponseInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.DataAccessException;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ji-sheng-hua 华夏ERP
+ */
+@RestController
+@RequestMapping(value = "/functions")
+public class FunctionsController {
+ private Logger logger = LoggerFactory.getLogger(FunctionsController.class);
+
+ @Resource
+ private FunctionsService functionsService;
+
+ @Resource
+ private UserBusinessService userBusinessService;
+
+ @PostMapping(value = "/findMenu")
+ public JSONArray findMenu(@RequestParam(value="pNumber") String pNumber,
+ @RequestParam(value="hasFunctions") String hasFunctions,
+ HttpServletRequest request)throws Exception {
+ //存放数据json数组
+ JSONArray dataArray = new JSONArray();
+ try {
+ String fc = hasFunctions; //当前用户所拥有的功能列表，格式如：[1][2][5]
+ List dataList = functionsService.getRoleFunctions(pNumber);
+ if (null != dataList) {
+ for (Functions functions : dataList) {
+ JSONObject item = new JSONObject();
+ item.put("id", functions.getId());
+ List dataList1 = functionsService.getRoleFunctions(functions.getNumber());
+ JSONArray dataArray1 = new JSONArray();
+ if (dataList1.size() != 0) {
+ item.put("text", functions.getName()); //是目录就没链接
+ item.put("icon", functions.getIcon());
+ for (Functions functions1 : dataList1) {
+ item.put("state", "open"); //如果不为空，节点展开
+ JSONObject item1 = new JSONObject();
+ List dataList2 = functionsService.getRoleFunctions(functions1.getNumber());
+ if (fc.indexOf("[" + functions1.getId().toString() + "]") != -1 || dataList2.size() != 0) {
+ item1.put("id", functions1.getId());
+ JSONArray dataArray2 = new JSONArray();
+ if (dataList2.size() != 0) {
+ item1.put("text", functions1.getName());//是目录就没链接
+ item1.put("icon", functions1.getIcon());
+ for (Functions functions2 : dataList2) {
+ item1.put("state", "closed"); //如果不为空，节点不展开
+ JSONObject item2 = new JSONObject();
+ List dataList3 = functionsService.getRoleFunctions(functions2.getNumber());
+ if (fc.indexOf("[" + functions2.getId().toString() + "]") != -1 || dataList3.size() != 0) {
+ item2.put("id", functions2.getId());
+ JSONArray dataArray3 = new JSONArray();
+ if (dataList3.size() != 0) {
+ item2.put("text", functions2.getName());//是目录就没链接
+ item2.put("icon", functions2.getIcon());
+ for (Functions functions3 : dataList3) {
+ item2.put("state", "closed"); //如果不为空，节点不展开
+ JSONObject item3 = new JSONObject();
+ item3.put("id", functions3.getId());
+ item3.put("text", functions3.getName());
+ item3.put("icon", functions3.getIcon());
+ //
+ dataArray3.add(item3);
+ item2.put("children", dataArray3);
+ }
+ } else {
+ //不是目录，有链接
+ item2.put("text", functions2.getName());
+ item2.put("icon", functions2.getIcon());
+ item2.put("url", functions2.getUrl());
+ dataArray2.add(item2);
+ item1.put("children", dataArray2);
+ }
+ } else {
+ //不是目录，有链接
+ }
+ }
+ } else {
+ //不是目录，有链接
+ item1.put("text", functions1.getName());
+ item1.put("icon", functions1.getIcon());
+ item1.put("url", functions1.getUrl());
+ dataArray1.add(item1);
+ item.put("children", dataArray1);
+ }
+ } else {
+ //不是目录，有链接
+ }
+ }
+ } else {
+ //不是目录，有链接
+ item.put("text", functions.getName());
+ item.put("icon", functions.getIcon());
+ item.put("url", functions.getUrl());
+ }
+ dataArray.add(item);
+ }
+ }
+ } catch (DataAccessException e) {
+ logger.error(">>>>>>>>>>>>>>>>>>>查找应用异常", e);
+ }
+ return dataArray;
+ }
+
+ /**
+ * 角色对应功能显示
+ * @param request
+ * @return
+ */
+ @PostMapping(value = "/findRoleFunctions")
+ public JSONArray findRoleFunctions(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
+ HttpServletRequest request)throws Exception {
+ JSONArray arr = new JSONArray();
+ try {
+ List dataListFun = functionsService.findRoleFunctions("0");
+ //开始拼接json数据
+ JSONObject outer = new JSONObject();
+ outer.put("id", 1);
+ outer.put("text", "功能列表");
+ outer.put("state", "open");
+ //存放数据json数组
+ JSONArray dataArray = new JSONArray();
+ if (null != dataListFun) {
+ //根据条件从列表里面移除"系统管理"
+ List dataList = new ArrayList();
+ for (Functions fun : dataListFun) {
+ //从session中获取租户id
+ String loginName = null;
+ Object userInfo = request.getSession().getAttribute("user");
+ if(userInfo != null) {
+ User user = (User) userInfo;
+ loginName = user.getLoginame();
+ }
+ if(("admin").equals(loginName)) {
+ dataList.add(fun);
+ } else {
+ if(!("系统管理").equals(fun.getName())) {
+ dataList.add(fun);
+ }
+ }
+ }
+
+ //筛选功能列表
+ for (Functions functions : dataList) {
+ JSONObject item = new JSONObject();
+ item.put("id", functions.getId());
+ item.put("text", functions.getName());
+
+ //勾选判断1
+ Boolean flag = false;
+ try {
+ flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions.getId().toString() + "]");
+ } catch (Exception e) {
+ logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
+ }
+ if (flag == true) {
+ item.put("checked", true);
+ }
+ //结束
+
+ List dataList1 = functionsService.findRoleFunctions(functions.getNumber());
+ JSONArray dataArray1 = new JSONArray();
+ if (null != dataList1) {
+
+ for (Functions functions1 : dataList1) {
+ item.put("state", "open"); //如果不为空，节点不展开
+ JSONObject item1 = new JSONObject();
+ item1.put("id", functions1.getId());
+ item1.put("text", functions1.getName());
+
+ //勾选判断2
+ //Boolean flag = false;
+ try {
+ flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions1.getId().toString() + "]");
+ } catch (Exception e) {
+ logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
+ }
+ if (flag == true) {
+ item1.put("checked", true);
+ }
+ //结束
+
+ List dataList2 = functionsService.findRoleFunctions(functions1.getNumber());
+ JSONArray dataArray2 = new JSONArray();
+ if (null != dataList2) {
+
+ for (Functions functions2 : dataList2) {
+ item1.put("state", "closed"); //如果不为空，节点不展开
+ JSONObject item2 = new JSONObject();
+ item2.put("id", functions2.getId());
+ item2.put("text", functions2.getName());
+
+ //勾选判断3
+ //Boolean flag = false;
+ try {
+ flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions2.getId().toString() + "]");
+ } catch (Exception e) {
+ logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
+ }
+ if (flag == true) {
+ item2.put("checked", true);
+ }
+ //结束
+
+ List dataList3 = functionsService.findRoleFunctions(functions2.getNumber());
+ JSONArray dataArray3 = new JSONArray();
+ if (null != dataList3) {
+
+ for (Functions functions3 : dataList3) {
+ item2.put("state", "closed"); //如果不为空，节点不展开
+ JSONObject item3 = new JSONObject();
+ item3.put("id", functions3.getId());
+ item3.put("text", functions3.getName());
+
+ //勾选判断4
+ //Boolean flag = false;
+ try {
+ flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions3.getId().toString() + "]");
+ } catch (Exception e) {
+ logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
+ }
+ if (flag == true) {
+ item3.put("checked", true);
+ }
+ //结束
+
+ dataArray3.add(item3);
+ item2.put("children", dataArray3);
+ }
+ }
+
+ dataArray2.add(item2);
+ item1.put("children", dataArray2);
+ }
+ }
+
+ dataArray1.add(item1);
+ item.put("children", dataArray1);
+ }
+
+ }
+ dataArray.add(item);
+ }
+ outer.put("children", dataArray);
+ arr.add(outer);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return arr;
+ }
+
+ /**
+ * 根据id列表查找功能信息
+ * @param functionsIds
+ * @param request
+ * @return
+ */
+ @GetMapping(value = "/findByIds")
+ public BaseResponseInfo findByIds(@RequestParam("functionsIds") String functionsIds,
+ HttpServletRequest request)throws Exception {
+ BaseResponseInfo res = new BaseResponseInfo();
+ try {
+ List dataList = functionsService.findByIds(functionsIds);
+ JSONObject outer = new JSONObject();
+ outer.put("total", dataList.size());
+ //存放数据json数组
+ JSONArray dataArray = new JSONArray();
+ if (null != dataList) {
+ for (Functions functions : dataList) {
+ JSONObject item = new JSONObject();
+ item.put("Id", functions.getId());
+ item.put("Name", functions.getName());
+ item.put("PushBtn", functions.getPushbtn());
+ item.put("op", 1);
+ dataArray.add(item);
+ }
+ }
+ outer.put("rows", dataArray);
+ res.code = 200;
+ res.data = outer;
+ } catch (Exception e) {
+ e.printStackTrace();
+ res.code = 500;
+ res.data = "获取数据失败";
+ }
+ return res;
+ }
+ /**
+ * create by: qiankunpingtai
+ * website：https://qiankunpingtai.cn
+ * description:
+ * 批量删除功能模块信息
+ * create time: 2019/3/29 11:15
+ * @Param: ids
+ * @return java.lang.Object
+ */
+ @RequestMapping(value = "/batchDeleteFunctionsByIds")
+ public Object batchDeleteFunctionsByIds(@RequestParam("ids") String ids) throws Exception {
+ JSONObject result = ExceptionConstants.standardSuccess();
+ int i= functionsService.batchDeleteFunctionsByIds(ids);
+ if(i<1){
+ logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
+ ExceptionConstants.FUNCTIONS_DELETE_FAILED_CODE,ExceptionConstants.FUNCTIONS_DELETE_FAILED_MSG,ids);
+ throw new BusinessRunTimeException(ExceptionConstants.FUNCTIONS_DELETE_FAILED_CODE,
+ ExceptionConstants.FUNCTIONS_DELETE_FAILED_MSG);
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/jsh/erp/datasource/entities/Tenant.java b/src/main/java/com/jsh/erp/datasource/entities/Tenant.java
index 80cdec8f..bbcd85f5 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/Tenant.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/Tenant.java
@@ -1,197 +1,197 @@
-package com.jsh.erp.datasource.entities;
-
-import java.util.Date;
-
-public class Tenant {
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database column jsh_tenant.id
- *
- * @mbggenerated
- */
- private Long id;
-
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database column jsh_tenant.tenant_id
- *
- * @mbggenerated
- */
- private Long tenantId;
-
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database column jsh_tenant.login_name
- *
- * @mbggenerated
- */
- private String loginName;
-
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database column jsh_tenant.user_num_limit
- *
- * @mbggenerated
- */
- private Integer userNumLimit;
-
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database column jsh_tenant.bills_num_limit
- *
- * @mbggenerated
- */
- private Integer billsNumLimit;
-
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database column jsh_tenant.create_time
- *
- * @mbggenerated
- */
- private Date createTime;
-
- /**
- * This method was generated by MyBatis Generator.
- * This method returns the value of the database column jsh_tenant.id
- *
- * @return the value of jsh_tenant.id
- *
- * @mbggenerated
- */
- public Long getId() {
- return id;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method sets the value of the database column jsh_tenant.id
- *
- * @param id the value for jsh_tenant.id
- *
- * @mbggenerated
- */
- public void setId(Long id) {
- this.id = id;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method returns the value of the database column jsh_tenant.tenant_id
- *
- * @return the value of jsh_tenant.tenant_id
- *
- * @mbggenerated
- */
- public Long getTenantId() {
- return tenantId;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method sets the value of the database column jsh_tenant.tenant_id
- *
- * @param tenantId the value for jsh_tenant.tenant_id
- *
- * @mbggenerated
- */
- public void setTenantId(Long tenantId) {
- this.tenantId = tenantId;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method returns the value of the database column jsh_tenant.login_name
- *
- * @return the value of jsh_tenant.login_name
- *
- * @mbggenerated
- */
- public String getLoginName() {
- return loginName;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method sets the value of the database column jsh_tenant.login_name
- *
- * @param loginName the value for jsh_tenant.login_name
- *
- * @mbggenerated
- */
- public void setLoginName(String loginName) {
- this.loginName = loginName == null ? null : loginName.trim();
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method returns the value of the database column jsh_tenant.user_num_limit
- *
- * @return the value of jsh_tenant.user_num_limit
- *
- * @mbggenerated
- */
- public Integer getUserNumLimit() {
- return userNumLimit;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method sets the value of the database column jsh_tenant.user_num_limit
- *
- * @param userNumLimit the value for jsh_tenant.user_num_limit
- *
- * @mbggenerated
- */
- public void setUserNumLimit(Integer userNumLimit) {
- this.userNumLimit = userNumLimit;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method returns the value of the database column jsh_tenant.bills_num_limit
- *
- * @return the value of jsh_tenant.bills_num_limit
- *
- * @mbggenerated
- */
- public Integer getBillsNumLimit() {
- return billsNumLimit;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method sets the value of the database column jsh_tenant.bills_num_limit
- *
- * @param billsNumLimit the value for jsh_tenant.bills_num_limit
- *
- * @mbggenerated
- */
- public void setBillsNumLimit(Integer billsNumLimit) {
- this.billsNumLimit = billsNumLimit;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method returns the value of the database column jsh_tenant.create_time
- *
- * @return the value of jsh_tenant.create_time
- *
- * @mbggenerated
- */
- public Date getCreateTime() {
- return createTime;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method sets the value of the database column jsh_tenant.create_time
- *
- * @param createTime the value for jsh_tenant.create_time
- *
- * @mbggenerated
- */
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
+package com.jsh.erp.datasource.entities;
+
+import java.util.Date;
+
+public class Tenant {
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column jsh_tenant.id
+ *
+ * @mbggenerated
+ */
+ private Long id;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column jsh_tenant.tenant_id
+ *
+ * @mbggenerated
+ */
+ private Long tenantId;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column jsh_tenant.login_name
+ *
+ * @mbggenerated
+ */
+ private String loginName;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column jsh_tenant.user_num_limit
+ *
+ * @mbggenerated
+ */
+ private Integer userNumLimit;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column jsh_tenant.bills_num_limit
+ *
+ * @mbggenerated
+ */
+ private Integer billsNumLimit;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database column jsh_tenant.create_time
+ *
+ * @mbggenerated
+ */
+ private Date createTime;
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column jsh_tenant.id
+ *
+ * @return the value of jsh_tenant.id
+ *
+ * @mbggenerated
+ */
+ public Long getId() {
+ return id;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column jsh_tenant.id
+ *
+ * @param id the value for jsh_tenant.id
+ *
+ * @mbggenerated
+ */
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column jsh_tenant.tenant_id
+ *
+ * @return the value of jsh_tenant.tenant_id
+ *
+ * @mbggenerated
+ */
+ public Long getTenantId() {
+ return tenantId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column jsh_tenant.tenant_id
+ *
+ * @param tenantId the value for jsh_tenant.tenant_id
+ *
+ * @mbggenerated
+ */
+ public void setTenantId(Long tenantId) {
+ this.tenantId = tenantId;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column jsh_tenant.login_name
+ *
+ * @return the value of jsh_tenant.login_name
+ *
+ * @mbggenerated
+ */
+ public String getLoginName() {
+ return loginName;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column jsh_tenant.login_name
+ *
+ * @param loginName the value for jsh_tenant.login_name
+ *
+ * @mbggenerated
+ */
+ public void setLoginName(String loginName) {
+ this.loginName = loginName == null ? null : loginName.trim();
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column jsh_tenant.user_num_limit
+ *
+ * @return the value of jsh_tenant.user_num_limit
+ *
+ * @mbggenerated
+ */
+ public Integer getUserNumLimit() {
+ return userNumLimit;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column jsh_tenant.user_num_limit
+ *
+ * @param userNumLimit the value for jsh_tenant.user_num_limit
+ *
+ * @mbggenerated
+ */
+ public void setUserNumLimit(Integer userNumLimit) {
+ this.userNumLimit = userNumLimit;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column jsh_tenant.bills_num_limit
+ *
+ * @return the value of jsh_tenant.bills_num_limit
+ *
+ * @mbggenerated
+ */
+ public Integer getBillsNumLimit() {
+ return billsNumLimit;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column jsh_tenant.bills_num_limit
+ *
+ * @param billsNumLimit the value for jsh_tenant.bills_num_limit
+ *
+ * @mbggenerated
+ */
+ public void setBillsNumLimit(Integer billsNumLimit) {
+ this.billsNumLimit = billsNumLimit;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method returns the value of the database column jsh_tenant.create_time
+ *
+ * @return the value of jsh_tenant.create_time
+ *
+ * @mbggenerated
+ */
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method sets the value of the database column jsh_tenant.create_time
+ *
+ * @param createTime the value for jsh_tenant.create_time
+ *
+ * @mbggenerated
+ */
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java b/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java
index 4c4834e1..c196986b 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java
+++ b/src/main/java/com/jsh/erp/datasource/entities/TenantExample.java
@@ -1,673 +1,673 @@
-package com.jsh.erp.datasource.entities;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class TenantExample {
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- protected String orderByClause;
-
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- protected boolean distinct;
-
- /**
- * This field was generated by MyBatis Generator.
- * This field corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- protected List oredCriteria;
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public TenantExample() {
- oredCriteria = new ArrayList();
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public void setOrderByClause(String orderByClause) {
- this.orderByClause = orderByClause;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public String getOrderByClause() {
- return orderByClause;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public void setDistinct(boolean distinct) {
- this.distinct = distinct;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public boolean isDistinct() {
- return distinct;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public List getOredCriteria() {
- return oredCriteria;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public void or(Criteria criteria) {
- oredCriteria.add(criteria);
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public Criteria or() {
- Criteria criteria = createCriteriaInternal();
- oredCriteria.add(criteria);
- return criteria;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public Criteria createCriteria() {
- Criteria criteria = createCriteriaInternal();
- if (oredCriteria.size() == 0) {
- oredCriteria.add(criteria);
- }
- return criteria;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- protected Criteria createCriteriaInternal() {
- Criteria criteria = new Criteria();
- return criteria;
- }
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- public void clear() {
- oredCriteria.clear();
- orderByClause = null;
- distinct = false;
- }
-
- /**
- * This class was generated by MyBatis Generator.
- * This class corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- 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));
- }
-
- 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 andTenantIdIsNull() {
- addCriterion("tenant_id is null");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdIsNotNull() {
- addCriterion("tenant_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdEqualTo(Long value) {
- addCriterion("tenant_id =", value, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdNotEqualTo(Long value) {
- addCriterion("tenant_id <>", value, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdGreaterThan(Long value) {
- addCriterion("tenant_id >", value, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
- addCriterion("tenant_id >=", value, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdLessThan(Long value) {
- addCriterion("tenant_id <", value, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdLessThanOrEqualTo(Long value) {
- addCriterion("tenant_id <=", value, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdIn(List values) {
- addCriterion("tenant_id in", values, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdNotIn(List values) {
- addCriterion("tenant_id not in", values, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdBetween(Long value1, Long value2) {
- addCriterion("tenant_id between", value1, value2, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andTenantIdNotBetween(Long value1, Long value2) {
- addCriterion("tenant_id not between", value1, value2, "tenantId");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameIsNull() {
- addCriterion("login_name is null");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameIsNotNull() {
- addCriterion("login_name is not null");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameEqualTo(String value) {
- addCriterion("login_name =", value, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameNotEqualTo(String value) {
- addCriterion("login_name <>", value, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameGreaterThan(String value) {
- addCriterion("login_name >", value, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameGreaterThanOrEqualTo(String value) {
- addCriterion("login_name >=", value, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameLessThan(String value) {
- addCriterion("login_name <", value, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameLessThanOrEqualTo(String value) {
- addCriterion("login_name <=", value, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameLike(String value) {
- addCriterion("login_name like", value, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameNotLike(String value) {
- addCriterion("login_name not like", value, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameIn(List values) {
- addCriterion("login_name in", values, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameNotIn(List values) {
- addCriterion("login_name not in", values, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameBetween(String value1, String value2) {
- addCriterion("login_name between", value1, value2, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andLoginNameNotBetween(String value1, String value2) {
- addCriterion("login_name not between", value1, value2, "loginName");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitIsNull() {
- addCriterion("user_num_limit is null");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitIsNotNull() {
- addCriterion("user_num_limit is not null");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitEqualTo(Integer value) {
- addCriterion("user_num_limit =", value, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitNotEqualTo(Integer value) {
- addCriterion("user_num_limit <>", value, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitGreaterThan(Integer value) {
- addCriterion("user_num_limit >", value, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitGreaterThanOrEqualTo(Integer value) {
- addCriterion("user_num_limit >=", value, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitLessThan(Integer value) {
- addCriterion("user_num_limit <", value, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitLessThanOrEqualTo(Integer value) {
- addCriterion("user_num_limit <=", value, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitIn(List values) {
- addCriterion("user_num_limit in", values, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitNotIn(List values) {
- addCriterion("user_num_limit not in", values, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitBetween(Integer value1, Integer value2) {
- addCriterion("user_num_limit between", value1, value2, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andUserNumLimitNotBetween(Integer value1, Integer value2) {
- addCriterion("user_num_limit not between", value1, value2, "userNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitIsNull() {
- addCriterion("bills_num_limit is null");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitIsNotNull() {
- addCriterion("bills_num_limit is not null");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitEqualTo(Integer value) {
- addCriterion("bills_num_limit =", value, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitNotEqualTo(Integer value) {
- addCriterion("bills_num_limit <>", value, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitGreaterThan(Integer value) {
- addCriterion("bills_num_limit >", value, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitGreaterThanOrEqualTo(Integer value) {
- addCriterion("bills_num_limit >=", value, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitLessThan(Integer value) {
- addCriterion("bills_num_limit <", value, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitLessThanOrEqualTo(Integer value) {
- addCriterion("bills_num_limit <=", value, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitIn(List values) {
- addCriterion("bills_num_limit in", values, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitNotIn(List values) {
- addCriterion("bills_num_limit not in", values, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitBetween(Integer value1, Integer value2) {
- addCriterion("bills_num_limit between", value1, value2, "billsNumLimit");
- return (Criteria) this;
- }
-
- public Criteria andBillsNumLimitNotBetween(Integer value1, Integer value2) {
- addCriterion("bills_num_limit not between", value1, value2, "billsNumLimit");
- 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;
- }
- }
-
- /**
- * This class was generated by MyBatis Generator.
- * This class corresponds to the database table jsh_tenant
- *
- * @mbggenerated do_not_delete_during_merge
- */
- public static class Criteria extends GeneratedCriteria {
-
- protected Criteria() {
- super();
- }
- }
-
- /**
- * This class was generated by MyBatis Generator.
- * This class corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- 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);
- }
- }
+package com.jsh.erp.datasource.entities;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TenantExample {
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ protected String orderByClause;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ protected boolean distinct;
+
+ /**
+ * This field was generated by MyBatis Generator.
+ * This field corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ protected List oredCriteria;
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public TenantExample() {
+ oredCriteria = new ArrayList();
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ 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));
+ }
+
+ 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 andTenantIdIsNull() {
+ addCriterion("tenant_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdIsNotNull() {
+ addCriterion("tenant_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdEqualTo(Long value) {
+ addCriterion("tenant_id =", value, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdNotEqualTo(Long value) {
+ addCriterion("tenant_id <>", value, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdGreaterThan(Long value) {
+ addCriterion("tenant_id >", value, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+ addCriterion("tenant_id >=", value, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdLessThan(Long value) {
+ addCriterion("tenant_id <", value, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+ addCriterion("tenant_id <=", value, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdIn(List values) {
+ addCriterion("tenant_id in", values, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdNotIn(List values) {
+ addCriterion("tenant_id not in", values, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdBetween(Long value1, Long value2) {
+ addCriterion("tenant_id between", value1, value2, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+ addCriterion("tenant_id not between", value1, value2, "tenantId");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameIsNull() {
+ addCriterion("login_name is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameIsNotNull() {
+ addCriterion("login_name is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameEqualTo(String value) {
+ addCriterion("login_name =", value, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameNotEqualTo(String value) {
+ addCriterion("login_name <>", value, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameGreaterThan(String value) {
+ addCriterion("login_name >", value, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameGreaterThanOrEqualTo(String value) {
+ addCriterion("login_name >=", value, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameLessThan(String value) {
+ addCriterion("login_name <", value, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameLessThanOrEqualTo(String value) {
+ addCriterion("login_name <=", value, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameLike(String value) {
+ addCriterion("login_name like", value, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameNotLike(String value) {
+ addCriterion("login_name not like", value, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameIn(List values) {
+ addCriterion("login_name in", values, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameNotIn(List values) {
+ addCriterion("login_name not in", values, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameBetween(String value1, String value2) {
+ addCriterion("login_name between", value1, value2, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andLoginNameNotBetween(String value1, String value2) {
+ addCriterion("login_name not between", value1, value2, "loginName");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitIsNull() {
+ addCriterion("user_num_limit is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitIsNotNull() {
+ addCriterion("user_num_limit is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitEqualTo(Integer value) {
+ addCriterion("user_num_limit =", value, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitNotEqualTo(Integer value) {
+ addCriterion("user_num_limit <>", value, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitGreaterThan(Integer value) {
+ addCriterion("user_num_limit >", value, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitGreaterThanOrEqualTo(Integer value) {
+ addCriterion("user_num_limit >=", value, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitLessThan(Integer value) {
+ addCriterion("user_num_limit <", value, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitLessThanOrEqualTo(Integer value) {
+ addCriterion("user_num_limit <=", value, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitIn(List values) {
+ addCriterion("user_num_limit in", values, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitNotIn(List values) {
+ addCriterion("user_num_limit not in", values, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitBetween(Integer value1, Integer value2) {
+ addCriterion("user_num_limit between", value1, value2, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andUserNumLimitNotBetween(Integer value1, Integer value2) {
+ addCriterion("user_num_limit not between", value1, value2, "userNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitIsNull() {
+ addCriterion("bills_num_limit is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitIsNotNull() {
+ addCriterion("bills_num_limit is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitEqualTo(Integer value) {
+ addCriterion("bills_num_limit =", value, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitNotEqualTo(Integer value) {
+ addCriterion("bills_num_limit <>", value, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitGreaterThan(Integer value) {
+ addCriterion("bills_num_limit >", value, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitGreaterThanOrEqualTo(Integer value) {
+ addCriterion("bills_num_limit >=", value, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitLessThan(Integer value) {
+ addCriterion("bills_num_limit <", value, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitLessThanOrEqualTo(Integer value) {
+ addCriterion("bills_num_limit <=", value, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitIn(List values) {
+ addCriterion("bills_num_limit in", values, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitNotIn(List values) {
+ addCriterion("bills_num_limit not in", values, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitBetween(Integer value1, Integer value2) {
+ addCriterion("bills_num_limit between", value1, value2, "billsNumLimit");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillsNumLimitNotBetween(Integer value1, Integer value2) {
+ addCriterion("bills_num_limit not between", value1, value2, "billsNumLimit");
+ 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;
+ }
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated do_not_delete_during_merge
+ */
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ /**
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ 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/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java
index e881f774..04069777 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/TenantMapper.java
@@ -1,96 +1,96 @@
-package com.jsh.erp.datasource.mappers;
-
-import com.jsh.erp.datasource.entities.Tenant;
-import com.jsh.erp.datasource.entities.TenantExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface TenantMapper {
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int countByExample(TenantExample example);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int deleteByExample(TenantExample example);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int deleteByPrimaryKey(Long id);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int insert(Tenant record);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int insertSelective(Tenant record);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- List selectByExample(TenantExample example);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- Tenant selectByPrimaryKey(Long id);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int updateByExampleSelective(@Param("record") Tenant record, @Param("example") TenantExample example);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int updateByExample(@Param("record") Tenant record, @Param("example") TenantExample example);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int updateByPrimaryKeySelective(Tenant record);
-
- /**
- * This method was generated by MyBatis Generator.
- * This method corresponds to the database table jsh_tenant
- *
- * @mbggenerated
- */
- int updateByPrimaryKey(Tenant record);
+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.Tenant;
+import com.jsh.erp.datasource.entities.TenantExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TenantMapper {
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int countByExample(TenantExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int deleteByExample(TenantExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int deleteByPrimaryKey(Long id);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int insert(Tenant record);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int insertSelective(Tenant record);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ List selectByExample(TenantExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ Tenant selectByPrimaryKey(Long id);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int updateByExampleSelective(@Param("record") Tenant record, @Param("example") TenantExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int updateByExample(@Param("record") Tenant record, @Param("example") TenantExample example);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int updateByPrimaryKeySelective(Tenant record);
+
+ /**
+ * This method was generated by MyBatis Generator.
+ * This method corresponds to the database table jsh_tenant
+ *
+ * @mbggenerated
+ */
+ int updateByPrimaryKey(Tenant record);
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
index be52df45..39af69e7 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java
@@ -1,17 +1,17 @@
-package com.jsh.erp.datasource.mappers;
-
-import com.jsh.erp.datasource.entities.Tenant;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface TenantMapperEx {
-
- List selectByConditionTenant(
- @Param("loginName") String loginName,
- @Param("offset") Integer offset,
- @Param("rows") Integer rows);
-
- Long countsByTenant(
- @Param("loginName") String loginName);
+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.Tenant;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TenantMapperEx {
+
+ List selectByConditionTenant(
+ @Param("loginName") String loginName,
+ @Param("offset") Integer offset,
+ @Param("rows") Integer rows);
+
+ Long countsByTenant(
+ @Param("loginName") String loginName);
}
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/service/ResourceInfo.java b/src/main/java/com/jsh/erp/service/ResourceInfo.java
index 352d7bea..be14a336 100644
--- a/src/main/java/com/jsh/erp/service/ResourceInfo.java
+++ b/src/main/java/com/jsh/erp/service/ResourceInfo.java
@@ -1,39 +1,39 @@
-package com.jsh.erp.service;
-
-import java.lang.annotation.*;
-
-/**
- * @author jishenghua 2018-10-7 15:25:39
- * user-5
- * role-10
- * depot-20
- * log-25
- * functions-30
- * inOutItem-35
- * unit-40
- * person-45
- * userBusiness-50
- * systemConfig-55
- * materialProperty-60
- * account-65
- * supplier-70
- * materialCategory-75
- * material-80
- * depotHead-85
- * depotItem-90
- * accountHead-95
- * accountItem-100
- * serialNumber-105
- * organization-110
- * orgaUserRel-115
- * tenant-120
- * msg-125
- */
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-public @interface ResourceInfo {
- String value();
- int type();
-}
+package com.jsh.erp.service;
+
+import java.lang.annotation.*;
+
+/**
+ * @author jishenghua 2018-10-7 15:25:39
+ * user-5
+ * role-10
+ * depot-20
+ * log-25
+ * functions-30
+ * inOutItem-35
+ * unit-40
+ * person-45
+ * userBusiness-50
+ * systemConfig-55
+ * materialProperty-60
+ * account-65
+ * supplier-70
+ * materialCategory-75
+ * material-80
+ * depotHead-85
+ * depotItem-90
+ * accountHead-95
+ * accountItem-100
+ * serialNumber-105
+ * organization-110
+ * orgaUserRel-115
+ * tenant-120
+ * msg-125
+ */
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+@Documented
+public @interface ResourceInfo {
+ String value();
+ int type();
+}
diff --git a/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java b/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
index 60e6b597..6e960838 100644
--- a/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
+++ b/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java
@@ -1,71 +1,71 @@
-package com.jsh.erp.service.tenant;
-
-import com.jsh.erp.service.ICommonQuery;
-import com.jsh.erp.service.user.UserResource;
-import com.jsh.erp.service.user.UserService;
-import com.jsh.erp.utils.Constants;
-import com.jsh.erp.utils.QueryUtils;
-import com.jsh.erp.utils.StringUtil;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
-
-@Service(value = "tenant_component")
-@TenantResource
-public class TenantComponent implements ICommonQuery {
-
- @Resource
- private TenantService tenantService;
-
- @Override
- public Object selectOne(Long id) throws Exception {
- return tenantService.getTenant(id);
- }
-
- @Override
- public List select(Map map)throws Exception {
- return getTenantList(map);
- }
-
- private List getTenantList(Map map)throws Exception {
- String search = map.get(Constants.SEARCH);
- String loginName = StringUtil.getInfo(search, "loginName");
- return tenantService.select(loginName, QueryUtils.offset(map), QueryUtils.rows(map));
- }
-
- @Override
- public Long counts(Map map)throws Exception {
- String search = map.get(Constants.SEARCH);
- String loginName = StringUtil.getInfo(search, "loginName");
- return tenantService.countTenant(loginName);
- }
-
- @Override
- public int insert(String beanJson, HttpServletRequest request)throws Exception {
- return tenantService.insertTenant(beanJson, request);
- }
-
- @Override
- public int update(String beanJson, Long id)throws Exception {
- return tenantService.updateTenant(beanJson, id);
- }
-
- @Override
- public int delete(Long id)throws Exception {
- return tenantService.deleteTenant(id);
- }
-
- @Override
- public int batchDelete(String ids)throws Exception {
- return tenantService.batchDeleteTenant(ids);
- }
-
- @Override
- public int checkIsNameExist(Long id, String name)throws Exception {
- return tenantService.checkIsNameExist(id, name);
- }
-
-}
+package com.jsh.erp.service.tenant;
+
+import com.jsh.erp.service.ICommonQuery;
+import com.jsh.erp.service.user.UserResource;
+import com.jsh.erp.service.user.UserService;
+import com.jsh.erp.utils.Constants;
+import com.jsh.erp.utils.QueryUtils;
+import com.jsh.erp.utils.StringUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+@Service(value = "tenant_component")
+@TenantResource
+public class TenantComponent implements ICommonQuery {
+
+ @Resource
+ private TenantService tenantService;
+
+ @Override
+ public Object selectOne(Long id) throws Exception {
+ return tenantService.getTenant(id);
+ }
+
+ @Override
+ public List select(Map map)throws Exception {
+ return getTenantList(map);
+ }
+
+ private List getTenantList(Map map)throws Exception {
+ String search = map.get(Constants.SEARCH);
+ String loginName = StringUtil.getInfo(search, "loginName");
+ return tenantService.select(loginName, QueryUtils.offset(map), QueryUtils.rows(map));
+ }
+
+ @Override
+ public Long counts(Map map)throws Exception {
+ String search = map.get(Constants.SEARCH);
+ String loginName = StringUtil.getInfo(search, "loginName");
+ return tenantService.countTenant(loginName);
+ }
+
+ @Override
+ public int insert(String beanJson, HttpServletRequest request)throws Exception {
+ return tenantService.insertTenant(beanJson, request);
+ }
+
+ @Override
+ public int update(String beanJson, Long id)throws Exception {
+ return tenantService.updateTenant(beanJson, id);
+ }
+
+ @Override
+ public int delete(Long id)throws Exception {
+ return tenantService.deleteTenant(id);
+ }
+
+ @Override
+ public int batchDelete(String ids)throws Exception {
+ return tenantService.batchDeleteTenant(ids);
+ }
+
+ @Override
+ public int checkIsNameExist(Long id, String name)throws Exception {
+ return tenantService.checkIsNameExist(id, name);
+ }
+
+}
diff --git a/src/main/java/com/jsh/erp/service/tenant/TenantResource.java b/src/main/java/com/jsh/erp/service/tenant/TenantResource.java
index c38deb64..eb83ae5f 100644
--- a/src/main/java/com/jsh/erp/service/tenant/TenantResource.java
+++ b/src/main/java/com/jsh/erp/service/tenant/TenantResource.java
@@ -1,15 +1,15 @@
-package com.jsh.erp.service.tenant;
-
-import com.jsh.erp.service.ResourceInfo;
-
-import java.lang.annotation.*;
-
-/**
- * @author jishenghua qq752718920 2019-6-27 22:56:56
- */
-@ResourceInfo(value = "tenant", type = 120)
-@Inherited
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TenantResource {
-}
+package com.jsh.erp.service.tenant;
+
+import com.jsh.erp.service.ResourceInfo;
+
+import java.lang.annotation.*;
+
+/**
+ * @author jishenghua qq752718920 2019-6-27 22:56:56
+ */
+@ResourceInfo(value = "tenant", type = 120)
+@Inherited
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TenantResource {
+}
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 7c1675f8..86291bb2 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,34 +1,34 @@
-
-
-
-
-
-
- ${LOG_PATTERN}
-
-
-
-
- ${LOG_FILE}.log
-
- ${LOG_PATTERN}
-
-
- ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
- 10
- 1GB
-
- 100MB
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ ${LOG_PATTERN}
+
+
+
+
+ ${LOG_FILE}.log
+
+ ${LOG_PATTERN}
+
+
+ ${LOG_FILE}.%d{yyyy-MM-dd}.%i.log
+ 10
+ 1GB
+
+ 100MB
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/mapper_xml/FunctionsMapper.xml b/src/main/resources/mapper_xml/FunctionsMapper.xml
index 82ab5d36..3fd63173 100644
--- a/src/main/resources/mapper_xml/FunctionsMapper.xml
+++ b/src/main/resources/mapper_xml/FunctionsMapper.xml
@@ -1,5 +1,5 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 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, tenant_id, login_name, user_num_limit, bills_num_limit, create_time
-
-
-
-
-
- delete from jsh_tenant
- where id = #{id,jdbcType=BIGINT}
-
-
-
- delete from jsh_tenant
-
-
-
-
-
-
- insert into jsh_tenant (id, tenant_id, login_name,
- user_num_limit, bills_num_limit, create_time
- )
- values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{loginName,jdbcType=VARCHAR},
- #{userNumLimit,jdbcType=INTEGER}, #{billsNumLimit,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
- )
-
-
-
- insert into jsh_tenant
-
-
- id,
-
-
- tenant_id,
-
-
- login_name,
-
-
- user_num_limit,
-
-
- bills_num_limit,
-
-
- create_time,
-
-
-
-
- #{id,jdbcType=BIGINT},
-
-
- #{tenantId,jdbcType=BIGINT},
-
-
- #{loginName,jdbcType=VARCHAR},
-
-
- #{userNumLimit,jdbcType=INTEGER},
-
-
- #{billsNumLimit,jdbcType=INTEGER},
-
-
- #{createTime,jdbcType=TIMESTAMP},
-
-
-
-
-
-
- update jsh_tenant
-
-
- id = #{record.id,jdbcType=BIGINT},
-
-
- tenant_id = #{record.tenantId,jdbcType=BIGINT},
-
-
- login_name = #{record.loginName,jdbcType=VARCHAR},
-
-
- user_num_limit = #{record.userNumLimit,jdbcType=INTEGER},
-
-
- bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER},
-
-
- create_time = #{record.createTime,jdbcType=TIMESTAMP},
-
-
-
-
-
-
-
-
- update jsh_tenant
- set id = #{record.id,jdbcType=BIGINT},
- tenant_id = #{record.tenantId,jdbcType=BIGINT},
- login_name = #{record.loginName,jdbcType=VARCHAR},
- user_num_limit = #{record.userNumLimit,jdbcType=INTEGER},
- bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER},
- create_time = #{record.createTime,jdbcType=TIMESTAMP}
-
-
-
-
-
-
- update jsh_tenant
-
-
- tenant_id = #{tenantId,jdbcType=BIGINT},
-
-
- login_name = #{loginName,jdbcType=VARCHAR},
-
-
- user_num_limit = #{userNumLimit,jdbcType=INTEGER},
-
-
- bills_num_limit = #{billsNumLimit,jdbcType=INTEGER},
-
-
- create_time = #{createTime,jdbcType=TIMESTAMP},
-
-
- where id = #{id,jdbcType=BIGINT}
-
-
-
- update jsh_tenant
- set tenant_id = #{tenantId,jdbcType=BIGINT},
- login_name = #{loginName,jdbcType=VARCHAR},
- user_num_limit = #{userNumLimit,jdbcType=INTEGER},
- bills_num_limit = #{billsNumLimit,jdbcType=INTEGER},
- create_time = #{createTime,jdbcType=TIMESTAMP}
- where id = #{id,jdbcType=BIGINT}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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, tenant_id, login_name, user_num_limit, bills_num_limit, create_time
+
+
+
+
+
+ delete from jsh_tenant
+ where id = #{id,jdbcType=BIGINT}
+
+
+
+ delete from jsh_tenant
+
+
+
+
+
+
+ insert into jsh_tenant (id, tenant_id, login_name,
+ user_num_limit, bills_num_limit, create_time
+ )
+ values (#{id,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, #{loginName,jdbcType=VARCHAR},
+ #{userNumLimit,jdbcType=INTEGER}, #{billsNumLimit,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
+ )
+
+
+
+ insert into jsh_tenant
+
+
+ id,
+
+
+ tenant_id,
+
+
+ login_name,
+
+
+ user_num_limit,
+
+
+ bills_num_limit,
+
+
+ create_time,
+
+
+
+
+ #{id,jdbcType=BIGINT},
+
+
+ #{tenantId,jdbcType=BIGINT},
+
+
+ #{loginName,jdbcType=VARCHAR},
+
+
+ #{userNumLimit,jdbcType=INTEGER},
+
+
+ #{billsNumLimit,jdbcType=INTEGER},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+
+
+
+
+ update jsh_tenant
+
+
+ id = #{record.id,jdbcType=BIGINT},
+
+
+ tenant_id = #{record.tenantId,jdbcType=BIGINT},
+
+
+ login_name = #{record.loginName,jdbcType=VARCHAR},
+
+
+ user_num_limit = #{record.userNumLimit,jdbcType=INTEGER},
+
+
+ bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER},
+
+
+ create_time = #{record.createTime,jdbcType=TIMESTAMP},
+
+
+
+
+
+
+
+
+ update jsh_tenant
+ set id = #{record.id,jdbcType=BIGINT},
+ tenant_id = #{record.tenantId,jdbcType=BIGINT},
+ login_name = #{record.loginName,jdbcType=VARCHAR},
+ user_num_limit = #{record.userNumLimit,jdbcType=INTEGER},
+ bills_num_limit = #{record.billsNumLimit,jdbcType=INTEGER},
+ create_time = #{record.createTime,jdbcType=TIMESTAMP}
+
+
+
+
+
+
+ update jsh_tenant
+
+
+ tenant_id = #{tenantId,jdbcType=BIGINT},
+
+
+ login_name = #{loginName,jdbcType=VARCHAR},
+
+
+ user_num_limit = #{userNumLimit,jdbcType=INTEGER},
+
+
+ bills_num_limit = #{billsNumLimit,jdbcType=INTEGER},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ where id = #{id,jdbcType=BIGINT}
+
+
+
+ update jsh_tenant
+ set tenant_id = #{tenantId,jdbcType=BIGINT},
+ login_name = #{loginName,jdbcType=VARCHAR},
+ user_num_limit = #{userNumLimit,jdbcType=INTEGER},
+ bills_num_limit = #{billsNumLimit,jdbcType=INTEGER},
+ create_time = #{createTime,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=BIGINT}
+
\ No newline at end of file