增加租户的功能

erp_web/pages/materials/material.html

@@ -85,7 +85,7 @@
                     <tr>
                         <td style="width:80px;">序列号</td>
                         <td style="padding:5px;width:180px;">
-                            <select name="enableSerialNumber" id="enableSerialNumber" style="width: 180px;height: 20px">
+                            <select name="EnableSerialNumber" id="EnableSerialNumber" style="width: 180px;height: 20px">
                                 <option value="1">启用</option>
                                 <option value="0">禁用</option>
                             </select>
@@ -509,7 +509,7 @@
                                 + 'AaBb' + rec.lowprice + 'AaBb' + rec.presetpriceone + 'AaBb' + rec.presetpricetwo + 'AaBb' + rec.remark + 'AaBb' + rec.standard
                                 + 'AaBb' + rec.color + 'AaBb' + rec.packing + 'AaBb' + rec.safetystock + 'AaBb' + rec.categoryid + 'AaBb' + rec.categoryName
                                 + 'AaBb' + rec.unitid + 'AaBb' + rec.unitName + 'AaBb' + rec.firstoutunit + 'AaBb' + rec.firstinunit
-                                + 'AaBb' + rec.mfrs + 'AaBb' + rec.otherfield1 + 'AaBb' + rec.otherfield2 + 'AaBb' + rec.otherfield3+ 'AaBb' + rec.enableSerialNumber;
+                                + 'AaBb' + rec.mfrs + 'AaBb' + rec.otherfield1 + 'AaBb' + rec.otherfield2 + 'AaBb' + rec.otherfield3+ 'AaBb' + rec.enableserialnumber;
                             str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
                             str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteMaterial(' + rec.id + ');"/>';
                             return str;
@@ -572,7 +572,7 @@
                         }
                     },
                     {
-                        title: '序列号', field: 'enableSerialNumber', width: 70, align: "center", formatter: function (value) {
+                        title: '序列号', field: 'enableserialnumber', width: 70, align: "center", formatter: function (value) {
                             return value=='1' ? "启用" : "禁用";
                         }
                     }
@@ -1048,8 +1048,8 @@
             $('#materialFM input').val(""); //将输入框全部清空
 
             bindMProperty(); //根据商品属性绑定
-            // $("#enableSerialNumber").combobox('setValue','0');
-            $("#enableSerialNumber").val('0');
+            // $("#EnableSerialNumber").combobox('setValue','0');
+            $("#EnableSerialNumber").val('0');
             $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
             $(".window-mask").css({width: webW, height: webH});
             $("#Name").val("").focus();
@@ -1157,7 +1157,7 @@
             basicList.LowPrice = $("#basicLowPrice").val();
             basicList.PresetPriceOne = $("#basicPresetPriceOne").val();
             basicList.PresetPriceTwo = $("#basicPresetPriceTwo").val();
-            basicList.enableSerialNumber=$("#enableSerialNumber").val();
+            basicList.EnableSerialNumber=$("#EnableSerialNumber").val();
             otherList.Unit = $("#otherUnit").text();
             otherList.RetailPrice = $("#otherRetailPrice").val();
             otherList.LowPrice = $("#otherLowPrice").val();
@@ -1226,7 +1226,7 @@
             bindMProperty(); //根据商品属性绑定
             $("#Name").focus().val(materialInfo[1]);
             $("#Color").focus().val(materialInfo[11]);
-            $("#enableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
+            $("#EnableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
             //商品类别id
             $("#parentid").val(materialInfo[14]);
             //商品类别名称

pom.xml

@@ -103,6 +103,11 @@
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<version>1.2.10</version>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>3.0.7.1</version>
+		</dependency>
 	</dependencies>
 
 	<repositories>

sql/jsh_erp.sql

@@ -1472,3 +1472,33 @@ update jsh_user set status='0' where status is null;
 -- 设置根目录编号为1
 -- ----------------------------
 update jsh_materialcategory set serial_no='1' where id='1';
+
+-- ----------------------------
+-- 时间：2019年3月18日
+-- version：1.0.11
+-- 此次更新
+-- 1、批量增加大部分表的tenant_id租户字段
+-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
+-- ----------------------------
+alter table jsh_account add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_accounthead add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_accountitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_asset add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_assetcategory add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_assetname add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_depot add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_depothead add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_depotitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_inoutitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_log add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_material add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_materialcategory add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_orga_user_rel add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_organization add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_person add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_role add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_serial_number add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_supplier add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_systemconfig add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_unit add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_user add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
\ No newline at end of file

src/main/java/com/jsh/erp/ErpApplication.java

@@ -2,6 +2,7 @@ package com.jsh.erp;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
@@ -10,6 +11,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.servlet.DispatcherServlet;
 
+import javax.servlet.http.Cookie;
+
 @SpringBootApplication
 @MapperScan(basePackages = {"com.jsh.erp.datasource.mappers"})
 @ServletComponentScan

src/main/java/com/jsh/erp/config/TenantConfig.java

+package com.jsh.erp.config;
+
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
+import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
+@Configuration
+public class TenantConfig {
+
+    @Bean
+    public PaginationInterceptor paginationInterceptor(HttpServletRequest request) {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        List<ISqlParser> sqlParserList = new ArrayList<>();
+        TenantSqlParser tenantSqlParser = new TenantSqlParser();
+        tenantSqlParser.setTenantHandler(new TenantHandler() {
+            @Override
+            public Expression getTenantId() {
+                //从session中获取租户id
+                Object tenantId = request.getSession().getAttribute("tenantId");
+                if(tenantId!=null){
+                    return new LongValue(Long.parseLong(tenantId.toString()));
+                } else {
+                    return null;
+                }
+            }
+
+            @Override
+            public String getTenantIdColumn() {
+                return "tenant_id";
+            }
+
+            @Override
+            public boolean doTableFilter(String tableName) {
+                //从session中获取租户id
+                Object mybatisPlusStatus = request.getSession().getAttribute("mybatisPlusStatus");
+                if(mybatisPlusStatus !=null && mybatisPlusStatus.toString().equals("open")) {
+                    // 这里可以判断是否过滤表
+                    if ("databasechangelog".equals(tableName) || "databasechangeloglock".equals(tableName)
+                            || "jsh_materialproperty".equals(tableName) || "tbl_sequence".equals(tableName) || "dual".equals(tableName)
+                            || "jsh_userbusiness".equals(tableName) || "jsh_app".equals(tableName) || "jsh_functions".equals(tableName)) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return true;
+                }
+            }
+        });
+
+        sqlParserList.add(tenantSqlParser);
+        paginationInterceptor.setSqlParserList(sqlParserList);
+//        paginationInterceptor.setSqlParserFilter(new ISqlParserFilter() {
+//            @Override
+//            public boolean doFilter(MetaObject metaObject) {
+//                MappedStatement ms = PluginUtils.realTarget(metaObject);
+//                // 过滤自定义查询此时无租户信息约束出现
+//                if ("com.jsh.erp.datasource.mappers.DepotHeadMapperEx.getBuildOnlyNumber".equals(ms.getId())) {
+//                    return true;
+//                }
+//                return false;
+//            }
+//        });
+        return paginationInterceptor;
+    }
+
+    /**
+     * 相当于顶部的：
+     * {@code @MapperScan("com.jsh.erp.datasource.mappers*")}
+     * 这里可以扩展，比如使用配置文件来配置扫描Mapper的路径
+     */
+    @Bean
+    public MapperScannerConfigurer mapperScannerConfigurer() {
+        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
+        scannerConfigurer.setBasePackage("com.jsh.erp.datasource.mappers*");
+        return scannerConfigurer;
+    }
+
+
+    /**
+     * 性能分析拦截器，不建议生产使用
+     */
+    @Bean
+    public PerformanceInterceptor performanceInterceptor(){
+        return new PerformanceInterceptor();
+    }
+
+
+}

src/main/java/com/jsh/erp/controller/DepotItemController.java

@@ -420,7 +420,7 @@ public class DepotItemController {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<String, Object>();
         try {
-            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
+            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
             String[] mpArr = mpList.split(",");
             int total = depotItemService.findByAllCount(headIds, materialIds);
             map.put("total", total);
@@ -533,7 +533,7 @@ public class DepotItemController {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<String, Object>();
         try {
-            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
+            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
             String[] mpArr = mpList.split(",");
             int total = depotItemService.findByAllCount(headIds, materialIds);
             map.put("total", total);
@@ -593,7 +593,7 @@ public class DepotItemController {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<String, Object>();
         try {
-            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
+            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
             String[] mpArr = mpList.split(",");
             int total = depotItemService.findByAllCount(headIds, materialIds);
             map.put("total", total);
@@ -659,7 +659,7 @@ public class DepotItemController {
         Map<String, Object> map = new HashMap<String, Object>();
         String message = "成功";
         try {
-            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
+            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
             //存放数据json数组
             Integer pid = projectId;
             String[] names = {"名称", "型号", "单位", "单价", "上月结存数量", "入库数量", "出库数量", "本月结存数量", "结存金额"};

src/main/java/com/jsh/erp/controller/RoleController.java

@@ -71,4 +71,9 @@ public class RoleController {
         }
         return arr;
     }
+
+    @PostMapping(value = "/list")
+    public List<Role> list(HttpServletRequest request) {
+        return roleService.getRole();
+    }
 }

src/main/java/com/jsh/erp/controller/UserController.java

@@ -17,11 +17,13 @@ import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
@@ -36,6 +38,9 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
 public class UserController {
     private Logger logger = LoggerFactory.getLogger(ResourceController.class);
 
+    @Value("${mybatis-plus.status}")
+    private String mybatisPlusStatus;
+
     @Resource
     private UserService userService;
 
@@ -91,6 +96,8 @@ public class UserController {
     //                            new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统"));
                         msgTip = "user can login";
                         request.getSession().setAttribute("user",user);
+                        request.getSession().setAttribute("tenantId",1L); //租户id
+                        request.getSession().setAttribute("mybatisPlusStatus",mybatisPlusStatus); //开启状态
                     } catch (Exception e) {
                         logger.error(">>>>>>>>>>>>>>>查询用户名为:" + username + " ，用户信息异常", e);
                     }

src/main/java/com/jsh/erp/datasource/entities/Account.java

-package com.jsh.erp.datasource.entities;
-
-import java.math.BigDecimal;
-
-public class Account {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.Id
-     *
-     * @mbggenerated
-     */
-    private Long id;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.Name
-     *
-     * @mbggenerated
-     */
-    private String name;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.SerialNo
-     *
-     * @mbggenerated
-     */
-    private String serialno;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.InitialAmount
-     *
-     * @mbggenerated
-     */
-    private BigDecimal initialamount;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.CurrentAmount
-     *
-     * @mbggenerated
-     */
-    private BigDecimal currentamount;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.Remark
-     *
-     * @mbggenerated
-     */
-    private String remark;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.IsDefault
-     *
-     * @mbggenerated
-     */
-    private Boolean isdefault;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_account.Id
-     *
-     * @return the value of jsh_account.Id
-     *
-     * @mbggenerated
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_account.Id
-     *
-     * @param id the value for jsh_account.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_account.Name
-     *
-     * @return the value of jsh_account.Name
-     *
-     * @mbggenerated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_account.Name
-     *
-     * @param name the value for jsh_account.Name
-     *
-     * @mbggenerated
-     */
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_account.SerialNo
-     *
-     * @return the value of jsh_account.SerialNo
-     *
-     * @mbggenerated
-     */
-    public String getSerialno() {
-        return serialno;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_account.SerialNo
-     *
-     * @param serialno the value for jsh_account.SerialNo
-     *
-     * @mbggenerated
-     */
-    public void setSerialno(String serialno) {
-        this.serialno = serialno == null ? null : serialno.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_account.InitialAmount
-     *
-     * @return the value of jsh_account.InitialAmount
-     *
-     * @mbggenerated
-     */
-    public BigDecimal getInitialamount() {
-        return initialamount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_account.InitialAmount
-     *
-     * @param initialamount the value for jsh_account.InitialAmount
-     *
-     * @mbggenerated
-     */
-    public void setInitialamount(BigDecimal initialamount) {
-        this.initialamount = initialamount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_account.CurrentAmount
-     *
-     * @return the value of jsh_account.CurrentAmount
-     *
-     * @mbggenerated
-     */
-    public BigDecimal getCurrentamount() {
-        return currentamount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_account.CurrentAmount
-     *
-     * @param currentamount the value for jsh_account.CurrentAmount
-     *
-     * @mbggenerated
-     */
-    public void setCurrentamount(BigDecimal currentamount) {
-        this.currentamount = currentamount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_account.Remark
-     *
-     * @return the value of jsh_account.Remark
-     *
-     * @mbggenerated
-     */
-    public String getRemark() {
-        return remark;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_account.Remark
-     *
-     * @param remark the value for jsh_account.Remark
-     *
-     * @mbggenerated
-     */
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_account.IsDefault
-     *
-     * @return the value of jsh_account.IsDefault
-     *
-     * @mbggenerated
-     */
-    public Boolean getIsdefault() {
-        return isdefault;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_account.IsDefault
-     *
-     * @param isdefault the value for jsh_account.IsDefault
-     *
-     * @mbggenerated
-     */
-    public void setIsdefault(Boolean isdefault) {
-        this.isdefault = isdefault;
-    }
+package com.jsh.erp.datasource.entities;
+
+import java.math.BigDecimal;
+
+public class Account {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.Id
+     *
+     * @mbggenerated
+     */
+    private Long id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.Name
+     *
+     * @mbggenerated
+     */
+    private String name;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.SerialNo
+     *
+     * @mbggenerated
+     */
+    private String serialno;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.InitialAmount
+     *
+     * @mbggenerated
+     */
+    private BigDecimal initialamount;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.CurrentAmount
+     *
+     * @mbggenerated
+     */
+    private BigDecimal currentamount;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.Remark
+     *
+     * @mbggenerated
+     */
+    private String remark;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.IsDefault
+     *
+     * @mbggenerated
+     */
+    private Boolean isdefault;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_account.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.Id
+     *
+     * @return the value of jsh_account.Id
+     *
+     * @mbggenerated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_account.Id
+     *
+     * @param id the value for jsh_account.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_account.Name
+     *
+     * @return the value of jsh_account.Name
+     *
+     * @mbggenerated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_account.Name
+     *
+     * @param name the value for jsh_account.Name
+     *
+     * @mbggenerated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.SerialNo
+     *
+     * @return the value of jsh_account.SerialNo
+     *
+     * @mbggenerated
+     */
+    public String getSerialno() {
+        return serialno;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_account.SerialNo
+     *
+     * @param serialno the value for jsh_account.SerialNo
+     *
+     * @mbggenerated
+     */
+    public void setSerialno(String serialno) {
+        this.serialno = serialno == null ? null : serialno.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.InitialAmount
+     *
+     * @return the value of jsh_account.InitialAmount
+     *
+     * @mbggenerated
+     */
+    public BigDecimal getInitialamount() {
+        return initialamount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_account.InitialAmount
+     *
+     * @param initialamount the value for jsh_account.InitialAmount
+     *
+     * @mbggenerated
+     */
+    public void setInitialamount(BigDecimal initialamount) {
+        this.initialamount = initialamount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.CurrentAmount
+     *
+     * @return the value of jsh_account.CurrentAmount
+     *
+     * @mbggenerated
+     */
+    public BigDecimal getCurrentamount() {
+        return currentamount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_account.CurrentAmount
+     *
+     * @param currentamount the value for jsh_account.CurrentAmount
+     *
+     * @mbggenerated
+     */
+    public void setCurrentamount(BigDecimal currentamount) {
+        this.currentamount = currentamount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.Remark
+     *
+     * @return the value of jsh_account.Remark
+     *
+     * @mbggenerated
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_account.Remark
+     *
+     * @param remark the value for jsh_account.Remark
+     *
+     * @mbggenerated
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.IsDefault
+     *
+     * @return the value of jsh_account.IsDefault
+     *
+     * @mbggenerated
+     */
+    public Boolean getIsdefault() {
+        return isdefault;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_account.IsDefault
+     *
+     * @param isdefault the value for jsh_account.IsDefault
+     *
+     * @mbggenerated
+     */
+    public void setIsdefault(Boolean isdefault) {
+        this.isdefault = isdefault;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.tenant_id
+     *
+     * @return the value of jsh_account.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_account.tenant_id
+     *
+     * @param tenantId the value for jsh_account.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/AccountHead.java

-package com.jsh.erp.datasource.entities;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class AccountHead {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.Id
-     *
-     * @mbggenerated
-     */
-    private Long id;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.Type
-     *
-     * @mbggenerated
-     */
-    private String type;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.OrganId
-     *
-     * @mbggenerated
-     */
-    private Long organid;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.HandsPersonId
-     *
-     * @mbggenerated
-     */
-    private Long handspersonid;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.ChangeAmount
-     *
-     * @mbggenerated
-     */
-    private BigDecimal changeamount;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.TotalPrice
-     *
-     * @mbggenerated
-     */
-    private BigDecimal totalprice;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.AccountId
-     *
-     * @mbggenerated
-     */
-    private Long accountid;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.BillNo
-     *
-     * @mbggenerated
-     */
-    private String billno;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.BillTime
-     *
-     * @mbggenerated
-     */
-    private Date billtime;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.Remark
-     *
-     * @mbggenerated
-     */
-    private String remark;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.Id
-     *
-     * @return the value of jsh_accounthead.Id
-     *
-     * @mbggenerated
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.Id
-     *
-     * @param id the value for jsh_accounthead.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_accounthead.Type
-     *
-     * @return the value of jsh_accounthead.Type
-     *
-     * @mbggenerated
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.Type
-     *
-     * @param type the value for jsh_accounthead.Type
-     *
-     * @mbggenerated
-     */
-    public void setType(String type) {
-        this.type = type == null ? null : type.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.OrganId
-     *
-     * @return the value of jsh_accounthead.OrganId
-     *
-     * @mbggenerated
-     */
-    public Long getOrganid() {
-        return organid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.OrganId
-     *
-     * @param organid the value for jsh_accounthead.OrganId
-     *
-     * @mbggenerated
-     */
-    public void setOrganid(Long organid) {
-        this.organid = organid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.HandsPersonId
-     *
-     * @return the value of jsh_accounthead.HandsPersonId
-     *
-     * @mbggenerated
-     */
-    public Long getHandspersonid() {
-        return handspersonid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.HandsPersonId
-     *
-     * @param handspersonid the value for jsh_accounthead.HandsPersonId
-     *
-     * @mbggenerated
-     */
-    public void setHandspersonid(Long handspersonid) {
-        this.handspersonid = handspersonid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.ChangeAmount
-     *
-     * @return the value of jsh_accounthead.ChangeAmount
-     *
-     * @mbggenerated
-     */
-    public BigDecimal getChangeamount() {
-        return changeamount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.ChangeAmount
-     *
-     * @param changeamount the value for jsh_accounthead.ChangeAmount
-     *
-     * @mbggenerated
-     */
-    public void setChangeamount(BigDecimal changeamount) {
-        this.changeamount = changeamount;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.TotalPrice
-     *
-     * @return the value of jsh_accounthead.TotalPrice
-     *
-     * @mbggenerated
-     */
-    public BigDecimal getTotalprice() {
-        return totalprice;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.TotalPrice
-     *
-     * @param totalprice the value for jsh_accounthead.TotalPrice
-     *
-     * @mbggenerated
-     */
-    public void setTotalprice(BigDecimal totalprice) {
-        this.totalprice = totalprice;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.AccountId
-     *
-     * @return the value of jsh_accounthead.AccountId
-     *
-     * @mbggenerated
-     */
-    public Long getAccountid() {
-        return accountid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.AccountId
-     *
-     * @param accountid the value for jsh_accounthead.AccountId
-     *
-     * @mbggenerated
-     */
-    public void setAccountid(Long accountid) {
-        this.accountid = accountid;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.BillNo
-     *
-     * @return the value of jsh_accounthead.BillNo
-     *
-     * @mbggenerated
-     */
-    public String getBillno() {
-        return billno;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.BillNo
-     *
-     * @param billno the value for jsh_accounthead.BillNo
-     *
-     * @mbggenerated
-     */
-    public void setBillno(String billno) {
-        this.billno = billno == null ? null : billno.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.BillTime
-     *
-     * @return the value of jsh_accounthead.BillTime
-     *
-     * @mbggenerated
-     */
-    public Date getBilltime() {
-        return billtime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.BillTime
-     *
-     * @param billtime the value for jsh_accounthead.BillTime
-     *
-     * @mbggenerated
-     */
-    public void setBilltime(Date billtime) {
-        this.billtime = billtime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.Remark
-     *
-     * @return the value of jsh_accounthead.Remark
-     *
-     * @mbggenerated
-     */
-    public String getRemark() {
-        return remark;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_accounthead.Remark
-     *
-     * @param remark the value for jsh_accounthead.Remark
-     *
-     * @mbggenerated
-     */
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
+package com.jsh.erp.datasource.entities;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class AccountHead {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.Id
+     *
+     * @mbggenerated
+     */
+    private Long id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.Type
+     *
+     * @mbggenerated
+     */
+    private String type;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.OrganId
+     *
+     * @mbggenerated
+     */
+    private Long organid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.HandsPersonId
+     *
+     * @mbggenerated
+     */
+    private Long handspersonid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.ChangeAmount
+     *
+     * @mbggenerated
+     */
+    private BigDecimal changeamount;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.TotalPrice
+     *
+     * @mbggenerated
+     */
+    private BigDecimal totalprice;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.AccountId
+     *
+     * @mbggenerated
+     */
+    private Long accountid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.BillNo
+     *
+     * @mbggenerated
+     */
+    private String billno;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.BillTime
+     *
+     * @mbggenerated
+     */
+    private Date billtime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.Remark
+     *
+     * @mbggenerated
+     */
+    private String remark;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_accounthead.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.Id
+     *
+     * @return the value of jsh_accounthead.Id
+     *
+     * @mbggenerated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.Id
+     *
+     * @param id the value for jsh_accounthead.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_accounthead.Type
+     *
+     * @return the value of jsh_accounthead.Type
+     *
+     * @mbggenerated
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.Type
+     *
+     * @param type the value for jsh_accounthead.Type
+     *
+     * @mbggenerated
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.OrganId
+     *
+     * @return the value of jsh_accounthead.OrganId
+     *
+     * @mbggenerated
+     */
+    public Long getOrganid() {
+        return organid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.OrganId
+     *
+     * @param organid the value for jsh_accounthead.OrganId
+     *
+     * @mbggenerated
+     */
+    public void setOrganid(Long organid) {
+        this.organid = organid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.HandsPersonId
+     *
+     * @return the value of jsh_accounthead.HandsPersonId
+     *
+     * @mbggenerated
+     */
+    public Long getHandspersonid() {
+        return handspersonid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.HandsPersonId
+     *
+     * @param handspersonid the value for jsh_accounthead.HandsPersonId
+     *
+     * @mbggenerated
+     */
+    public void setHandspersonid(Long handspersonid) {
+        this.handspersonid = handspersonid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.ChangeAmount
+     *
+     * @return the value of jsh_accounthead.ChangeAmount
+     *
+     * @mbggenerated
+     */
+    public BigDecimal getChangeamount() {
+        return changeamount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.ChangeAmount
+     *
+     * @param changeamount the value for jsh_accounthead.ChangeAmount
+     *
+     * @mbggenerated
+     */
+    public void setChangeamount(BigDecimal changeamount) {
+        this.changeamount = changeamount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.TotalPrice
+     *
+     * @return the value of jsh_accounthead.TotalPrice
+     *
+     * @mbggenerated
+     */
+    public BigDecimal getTotalprice() {
+        return totalprice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.TotalPrice
+     *
+     * @param totalprice the value for jsh_accounthead.TotalPrice
+     *
+     * @mbggenerated
+     */
+    public void setTotalprice(BigDecimal totalprice) {
+        this.totalprice = totalprice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.AccountId
+     *
+     * @return the value of jsh_accounthead.AccountId
+     *
+     * @mbggenerated
+     */
+    public Long getAccountid() {
+        return accountid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.AccountId
+     *
+     * @param accountid the value for jsh_accounthead.AccountId
+     *
+     * @mbggenerated
+     */
+    public void setAccountid(Long accountid) {
+        this.accountid = accountid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.BillNo
+     *
+     * @return the value of jsh_accounthead.BillNo
+     *
+     * @mbggenerated
+     */
+    public String getBillno() {
+        return billno;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.BillNo
+     *
+     * @param billno the value for jsh_accounthead.BillNo
+     *
+     * @mbggenerated
+     */
+    public void setBillno(String billno) {
+        this.billno = billno == null ? null : billno.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.BillTime
+     *
+     * @return the value of jsh_accounthead.BillTime
+     *
+     * @mbggenerated
+     */
+    public Date getBilltime() {
+        return billtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.BillTime
+     *
+     * @param billtime the value for jsh_accounthead.BillTime
+     *
+     * @mbggenerated
+     */
+    public void setBilltime(Date billtime) {
+        this.billtime = billtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.Remark
+     *
+     * @return the value of jsh_accounthead.Remark
+     *
+     * @mbggenerated
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_accounthead.Remark
+     *
+     * @param remark the value for jsh_accounthead.Remark
+     *
+     * @mbggenerated
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_accounthead.tenant_id
+     *
+     * @return the value of jsh_accounthead.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_accounthead.tenant_id
+     *
+     * @param tenantId the value for jsh_accounthead.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java

@@ -25,6 +25,8 @@ public class AccountHeadVo4ListEx {
 
     private String remark;
 
+    private Long tenantId;
+
     private String organname;
 
     private String handspersonname;
@@ -111,6 +113,14 @@ public class AccountHeadVo4ListEx {
         this.remark = remark;
     }
 
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
+
     public String getOrganname() {
         return organname;
     }