机构：增加机构创建加入城市字段

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OrganizationDao.java

@@ -9,7 +9,7 @@ import java.util.Set;
 
 public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 
-    Organization getByName(String name,Integer tenantId);
+    Organization getByName(@Param("name") String name,@Param("tenantId") Integer tenantId);
 
     /**
      * 根据父级id查询子级列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TenantInfoDto.java

@@ -69,6 +69,9 @@ public class TenantInfoDto implements Serializable {
     @ApiModelProperty(value = "机构logo")
     private String logo;
 
+    @ApiModelProperty(value = "城市id-sys_area")
+    private Integer areaId;
+
     /**
      * 客服电话
      */
@@ -168,6 +171,14 @@ public class TenantInfoDto implements Serializable {
         this.logo = logo;
     }
 
+    public Integer getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(Integer areaId) {
+        this.areaId = areaId;
+    }
+
     public String getCustomerServicePhone() {
         return customerServicePhone;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantInfo.java

@@ -11,10 +11,11 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 机构信息表
- * 对应数据库表(tenant_info):
+ * 机构表(TenantInfo)表实体类
+ *
+ * @author hgw
  */
-@ApiModel(value = "TenantInfo机构表")
+@ApiModel(value = "tenant_info-机构表")
 public class TenantInfo implements Serializable {
     @TableId(value = "id_", type = IdType.AUTO)
     @ApiModelProperty(value = "机构id")
@@ -170,6 +171,30 @@ public class TenantInfo implements Serializable {
         this.remark = remark;
     }
 
+    public String getTsignCode() {
+        return tsignCode;
+    }
+
+    public void setTsignCode(String tsignCode) {
+        this.tsignCode = tsignCode;
+    }
+
+    public String getTsignName() {
+        return tsignName;
+    }
+
+    public void setTsignName(String tsignName) {
+        this.tsignName = tsignName;
+    }
+
+    public Integer getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(Integer areaId) {
+        this.areaId = areaId;
+    }
+
     public String getDomainName() {
         return domainName;
     }
@@ -234,30 +259,6 @@ public class TenantInfo implements Serializable {
         this.updatedTime = updatedTime;
     }
 
-    public String getTsignCode() {
-        return tsignCode;
-    }
-
-    public void setTsignCode(String tsignCode) {
-        this.tsignCode = tsignCode;
-    }
-
-    public String getTsignName() {
-        return tsignName;
-    }
-
-    public void setTsignName(String tsignName) {
-        this.tsignName = tsignName;
-    }
-
-    public Integer getAreaId() {
-        return areaId;
-    }
-
-    public void setAreaId(Integer areaId) {
-        this.areaId = areaId;
-    }
-
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -103,16 +103,18 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         //添加机构配置
         setIdByApply(tenantId, dto.getConfig(), dto.getConfig()::setTenantId, tenantConfigService::addConfig);
         //创建一个和机构同名称的“分部”
-        createOrg(tenantInfo);
+        createOrg(tenantInfo,dto.getAreaId());
     }
 
     //创建一个和机构同名称的“分部”
-    private void createOrg(TenantInfo tenantInfo) {
+    private void createOrg(TenantInfo tenantInfo,Integer areaId) {
         Organization organization = new Organization();
         organization.setName(tenantInfo.getName());
         organization.setDelFlag(YesOrNoEnum.NO);
         organization.setGradeType(GradeTypeEnum.SIX_PLUS);
         organization.setCreateTime(new Date());
+        organization.setTenantId(tenantInfo.getId());
+        organization.setAreaId(areaId);
         organizationDao.insert(organization);
     }
 

mec-biz/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -53,7 +53,7 @@
         VALUES(#{id},#{name},#{areaId},now(),now(),#{registerDate},#{linkman},#{mobile},#{address},
                #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
                ,#{organManager},#{educationId},#{repairId},#{joinTeacherId},#{organManagerName},
-               #{educationName},#{repairName},#{joinTeacherName}),#{tenantId}
+               #{educationName},#{repairName},#{joinTeacherName},#{tenantId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->