优化：templateId字段，登录区分是哪个产品

src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java

@@ -44,7 +44,6 @@ public class MybatisPlusConfig {
         // 从请求头拿ID
         tenantId = request.getHeader("tenantId");
         if(tenantId != null){
-          System.out.println("从请求头拿ID = " + tenantId);
           return new LongValue(tenantId);
         }
         // 从域名拿ID

src/main/java/com/gxwebsoft/common/system/controller/MainController.java

@@ -715,6 +715,9 @@ public class MainController extends BaseController {
     if(user.getAddress() != null){
       userParam.setAddress(user.getAddress());
     }
+    if(user.getTemplateId() != null){
+      userParam.setTemplateId(user.getTemplateId());
+    }
 
     if (!isAdmin) {
       // 短信验证
@@ -773,6 +776,9 @@ public class MainController extends BaseController {
       company.setIndustryParent(user.getIndustryParent());
       company.setIndustryChild(user.getIndustryChild());
     }
+    if(user.getTemplateId() != null){
+      company.setTemplateId(user.getTemplateId());
+    }
     final Company addCompany = tenantService.initialization(company);
     if (ObjectUtil.isNotEmpty(addCompany)) {
       final User adminByPhone = userService.getAdminByPhone(phone);

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -95,6 +95,12 @@
       <if test="param.isStaff != null">
         AND a.organization_id > 0
       </if>
+      <if test="param.installed != null">
+        AND a.installed = #{param.installed}
+      </if>
+      <if test="param.templateId != null">
+        AND a.template_id = #{param.templateId}
+      </if>
       <if test="param.merchantId != null">
         AND a.merchant_id = #{param.merchantId}
       </if>

src/main/java/com/gxwebsoft/common/system/param/LoginParam.java

@@ -40,6 +40,12 @@ public class LoginParam implements Serializable {
     @ApiModelProperty("是否超级管理员")
     private Boolean isSuperAdmin;
 
+    @ApiModelProperty("应用安装状态")
+    private Boolean installed;
+
+    @ApiModelProperty("模板id")
+    private Integer templateId;
+
     @ApiModelProperty(value = "租户id")
     private Integer tenantId;
 

src/main/java/com/gxwebsoft/common/system/param/UserParam.java

@@ -284,4 +284,8 @@ public class UserParam extends BaseParam {
     @ApiModelProperty(value = "工业园区")
     @TableField(exist = false)
     private String park;
+
+    @ApiModelProperty(value = "是否已安装")
+    @TableField(exist = false)
+    private Boolean installed;
 }

src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java

@@ -113,6 +113,9 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
       superAdmin.setRealName(company.getBusinessEntity());
       superAdmin.setPassword(userService.encodePassword(company.getPassword()));
       superAdmin.setTenantId(company.getTid());
+      if(company.getTemplateId() != null){
+        superAdmin.setTemplateId(company.getTemplateId());
+      }
       boolean result = userService.save(superAdmin);
       Integer superAdminUserId = superAdmin.getUserId();
 

src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java

@@ -304,6 +304,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
       userParam.setIsAdmin(true);
       userParam.setTenantId(param.getTenantId());
       userParam.setLimit(50L);
+      if(param.getTemplateId() != null){
+        userParam.setTemplateId(param.getTemplateId());
+      }
       return baseMapper.selectListAllRel(userParam);
     }