新增企业服务

blade-biz-common/src/main/java/org/springblade/common/constant/ServicesName.java

@@ -2,18 +2,22 @@ package org.springblade.common.constant;
 
 public interface ServicesName  {
 
-	//物业系统
+	//物业服务
 	String ESTATE_SERVICE = "estate";
 
-	//社区系统（园区）
-	String COMMUNITY_SERVICE = "community";
+	//社区服务（园区）
+	String COMMUNITY_SERVICE = "cyzh-community";
 
 	//人员系统
 	String PERSON_SERVICE = "person";
 
-	//网格系统
+	//网格服务
 	String GRID_SERVICE = "grid";
 
-	String SYSTEM_EXPAND_SERVICE = "system-expand";
+	//系统扩展服务
+	String SYSTEM_EXPAND_SERVICE = "blade-system-expand";
+
+	//企业服务
+	String ENTERPRISE_SERVICE = "cyzh-enterprise";
 
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IAgencyClient.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author lianghanqiang
  * @since 2021-03-29
  */
-@FeignClient(value = "blade-community",path = "/feign/agency")
+@FeignClient(value = "cyzh-community",path = "/feign/agency")
 public interface IAgencyClient  {
 
 	/**
@@ -27,7 +27,7 @@ public interface IAgencyClient  {
     AgencyVO detail(Agency agency);
 
 	/**
-	 * 查询 
+	 * 查询
 	 */
 	@GetMapping("/list")
     List<AgencyVO> list(Agency agency);
@@ -35,29 +35,29 @@ public interface IAgencyClient  {
 
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	boolean save(@Valid @RequestBody Agency agency);
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
     boolean update(@Valid @RequestBody Agency agency);
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody Agency agency);
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IBuildingClient.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author lianghanqiang
  * @since 2021-03-29
  */
-@FeignClient(value = "blade-community",path = "/feign/building")
+@FeignClient(value = "cyzh-community",path = "/feign/building")
 public interface IBuildingClient  {
 
 	/**
@@ -27,7 +27,7 @@ public interface IBuildingClient  {
     BuildingVO detail(Building building);
 
 	/**
-	 * 查询 
+	 * 查询
 	 */
 	@GetMapping("/list")
     List<BuildingVO> list(Building building);
@@ -35,29 +35,29 @@ public interface IBuildingClient  {
 
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	boolean save(@Valid @RequestBody Building building);
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
     boolean update(@Valid @RequestBody Building building);
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody Building building);
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IFloorClient.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author lianghanqiang
  * @since 2021-03-29
  */
-@FeignClient(value = "blade-community",path = "/feign/floor")
+@FeignClient(value = "cyzh-community",path = "/feign/floor")
 public interface IFloorClient  {
 
 	/**
@@ -27,7 +27,7 @@ public interface IFloorClient  {
     FloorVO detail(Floor floor);
 
 	/**
-	 * 查询 
+	 * 查询
 	 */
 	@GetMapping("/list")
     List<FloorVO> list(Floor floor);
@@ -35,29 +35,29 @@ public interface IFloorClient  {
 
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	boolean save(@Valid @RequestBody Floor floor);
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
     boolean update(@Valid @RequestBody Floor floor);
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody Floor floor);
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IHouseuserClient.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author lianghanqiang
  * @since 2021-03-29
  */
-@FeignClient(value = "blade-community",path = "/feign/houseuser")
+@FeignClient(value = "cyzh-community",path = "/feign/houseuser")
 public interface IHouseuserClient  {
 
 	/**
@@ -52,12 +52,12 @@ public interface IHouseuserClient  {
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody Houseuser houseuser);
 
-	
+
 	/**
 	 * 删除 住户表
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IResidentialClient.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author lianghanqiang
  * @since 2021-03-29
  */
-@FeignClient(value = "blade-community",path = "/feign/residential")
+@FeignClient(value = "cyzh-community",path = "/feign/residential")
 public interface IResidentialClient  {
 
 	/**
@@ -52,12 +52,12 @@ public interface IResidentialClient  {
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody Residential residential);
 
-	
+
 	/**
 	 * 删除 小区表，新建小区的时候，小区也要作为一个机构存入到机构表里面，机构的编号就使用当前小区的编号
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IRoomClient.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author lianghanqiang
  * @since 2021-03-29
  */
-@FeignClient(value = "blade-community",path = "/feign/room")
+@FeignClient(value = "cyzh-community",path = "/feign/room")
 public interface IRoomClient  {
 
 	/**
@@ -52,12 +52,12 @@ public interface IRoomClient  {
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody Room room);
 
-	
+
 	/**
 	 * 删除 房间表
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IUnitClient.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @author lianghanqiang
  * @since 2021-03-29
  */
-@FeignClient(value = "blade-community",path = "/feign/unit")
+@FeignClient(value = "cyzh-community",path = "/feign/unit")
 public interface IUnitClient  {
 
 	/**
@@ -52,12 +52,12 @@ public interface IUnitClient  {
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody Unit unit);
 
-	
+
 	/**
 	 * 删除 单元表
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
 }

blade-service-api/person-api/pom.xml → blade-service-api/enterprise-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>persion-api</artifactId>
+    <artifactId>enterprise-api</artifactId>
 
 
 </project>

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/dto/EnterpriseDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.dto;
+
+import org.springblade.enterprise.entity.Enterprise;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EnterpriseDTO extends Enterprise {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/dto/ProjectDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.dto;
+
+import org.springblade.enterprise.entity.Project;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectDTO extends Project {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/dto/StaffDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.dto;
+
+import org.springblade.enterprise.entity.Staff;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StaffDTO extends Staff {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/entity/Enterprise.java

@@ -0,0 +1,132 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@TableName("cyzh_enterprise")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Enterprise对象", description = "Enterprise对象")
+public class Enterprise extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 企业类型
+	*/
+		@ApiModelProperty(value = "企业类型")
+		private String enterpriseType;
+	/**
+	* 企业名称
+	*/
+		@ApiModelProperty(value = "企业名称")
+		private String enterpriseName;
+	/**
+	* 统一信用代码
+	*/
+		@ApiModelProperty(value = "统一信用代码")
+		private String creditCode;
+	/**
+	* 组织机构代码
+	*/
+		@ApiModelProperty(value = "组织机构代码")
+		private String organizationCode;
+	/**
+	* 注册资金
+	*/
+		@ApiModelProperty(value = "注册资金")
+		private String registeredCapital;
+	/**
+	* 注册地址
+	*/
+		@ApiModelProperty(value = "注册地址")
+		private String registeredAddress;
+	/**
+	* 法定代表人
+	*/
+		@ApiModelProperty(value = "法定代表人")
+		private String representative;
+	/**
+	* 成立日期
+	*/
+		@ApiModelProperty(value = "成立日期")
+		private String registeredDate;
+	/**
+	* 办公电话
+	*/
+		@ApiModelProperty(value = "办公电话")
+		private String officeNum;
+	/**
+	* 详细地址
+	*/
+		@ApiModelProperty(value = "详细地址")
+		private String region;
+	/**
+	* logo
+	*/
+		@ApiModelProperty(value = "logo")
+		private String logo;
+	/**
+	* 企业简介
+	*/
+		@ApiModelProperty(value = "企业简介")
+		private String enterpriseIntroduce;
+	/**
+	* 营业执照
+	*/
+		@ApiModelProperty(value = "营业执照")
+		private String businessLicense;
+	/**
+	* 经度
+	*/
+		@ApiModelProperty(value = "经度")
+		private String longitude;
+	/**
+	* 纬度
+	*/
+		@ApiModelProperty(value = "纬度")
+		private String latitude;
+	/**
+	* 园区id
+	*/
+		@ApiModelProperty(value = "园区id")
+		private Long agencyId;
+	/**
+	* 区域id
+	*/
+		@ApiModelProperty(value = "区域id")
+		private Long residentialId;
+	/**
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
+
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/entity/Project.java

@@ -0,0 +1,107 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@TableName("enterprise_project")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Project对象", description = "Project对象")
+public class Project extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 项目名称
+	*/
+		@ApiModelProperty(value = "项目名称")
+		private String name;
+	/**
+	* 企业id
+	*/
+		@ApiModelProperty(value = "企业id")
+		private Long enterpriseId;
+	/**
+	* 投资规模
+	*/
+		@ApiModelProperty(value = "投资规模")
+		private String investmentScale;
+	/**
+	* 项目就业人数
+	*/
+		@ApiModelProperty(value = "项目就业人数")
+		private Integer employmentNumber;
+	/**
+	* 研发人员人数
+	*/
+		@ApiModelProperty(value = "研发人员人数")
+		private Integer researchNumber;
+	/**
+	* 项目投资总额
+	*/
+		@ApiModelProperty(value = "项目投资总额")
+		private String investmentAmount;
+	/**
+	* 项目投资收益
+	*/
+		@ApiModelProperty(value = "项目投资收益")
+		private String investmentReturn;
+	/**
+	* 已完成投资总额
+	*/
+		@ApiModelProperty(value = "已完成投资总额")
+		private String investmentCompleted;
+	/**
+	* 项目研发费用
+	*/
+		@ApiModelProperty(value = "项目研发费用")
+		private String researchCost;
+	/**
+	* 项目上缴税金
+	*/
+		@ApiModelProperty(value = "项目上缴税金")
+		private String taxes;
+	/**
+	* 已申请奖补金额
+	*/
+		@ApiModelProperty(value = "已申请奖补金额")
+		private String taward;
+	/**
+	* 已发放奖补金额
+	*/
+		@ApiModelProperty(value = "已发放奖补金额")
+		private String tawardCompleted;
+	/**
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
+
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/entity/Staff.java

@@ -0,0 +1,188 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.core.mp.base.BaseEntity;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@TableName("enterprise_staff")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Staff对象", description = "Staff对象")
+public class Staff extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 昵称
+	*/
+		@ApiModelProperty(value = "昵称")
+		private String name;
+	/**
+	* 真名
+	*/
+		@ApiModelProperty(value = "真名")
+		private String realName;
+	/**
+	* 邮箱
+	*/
+		@ApiModelProperty(value = "邮箱")
+		private String email;
+	/**
+	* 头像
+	*/
+		@ApiModelProperty(value = "头像")
+		private String avatar;
+	/**
+	* 手机
+	*/
+		@ApiModelProperty(value = "手机")
+		private String phone;
+	/**
+	* 生日
+	*/
+		@ApiModelProperty(value = "生日")
+		private LocalDateTime birthday;
+	/**
+	* 人脸信息
+	*/
+		@ApiModelProperty(value = "人脸信息")
+		private String face;
+	/**
+	* 身份证号码
+	*/
+		@ApiModelProperty(value = "身份证号码")
+		private String idcard;
+	/**
+	* 性别
+	*/
+		@ApiModelProperty(value = "性别")
+		private Integer sex;
+	/**
+	* 住址
+	*/
+		@ApiModelProperty(value = "住址")
+		private String address;
+	/**
+	* 审核时间
+	*/
+		@ApiModelProperty(value = "审核时间")
+		private LocalDateTime auditTime;
+	/**
+	* 是否审核通过（0待审核，1审核通过，2审核不通过）
+	*/
+		@ApiModelProperty(value = "是否审核通过（0待审核，1审核通过，2审核不通过）")
+		private Integer auditStatus;
+	/**
+	* 审核意见
+	*/
+		@ApiModelProperty(value = "审核意见")
+		private String auditOpinion;
+	/**
+	* 所属企业
+	*/
+		@ApiModelProperty(value = "所属企业")
+		private Long enterpriseId;
+	/**
+	* 企业名称
+	*/
+		@ApiModelProperty(value = "企业名称")
+		private String enterpriseName;
+	/**
+	* 园区id
+	*/
+		@ApiModelProperty(value = "园区id")
+		private Long agencyId;
+	/**
+	* 区域id
+	*/
+		@ApiModelProperty(value = "区域id")
+		private Long residentialId;
+	/**
+	* 小程序openId
+	*/
+		@ApiModelProperty(value = "小程序openId")
+		private String openId;
+	/**
+	* 部门id
+	*/
+		@ApiModelProperty(value = "部门id")
+		private String deptId;
+	/**
+	* 岗位id
+	*/
+		@ApiModelProperty(value = "岗位id")
+		private String postId;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remarks;
+	/**
+	* 创建方式（来源）{0：后台，1：小程序}
+	*/
+		@ApiModelProperty(value = "创建方式（来源）{0：后台，1：小程序}")
+		private Integer createType;
+	/**
+	* 机构路径
+	*/
+		@ApiModelProperty(value = "机构路径")
+		private String orgPosition;
+	/**
+	* 是否为小程序园区管理员：0-否 1-是
+	*/
+		@ApiModelProperty(value = "是否为小程序园区管理员：0-否 1-是")
+		private Integer isAgencyManager;
+	/**
+	* 若为园区管理员时的小程序登录账号
+	*/
+		@ApiModelProperty(value = "若为园区管理员时的小程序登录账号")
+		private String agencyAccount;
+	/**
+	* 若为园区管理员时的小程序登录密码
+	*/
+		@ApiModelProperty(value = "若为园区管理员时的小程序登录密码")
+		private String agencyPassword;
+	/**
+	* 是否为企业管理员：0-否 1-是
+	*/
+		@ApiModelProperty(value = "是否为企业管理员：0-否 1-是")
+		private Integer isEnterpriseManager;
+	/**
+	* 若为企业管理员时的小程序登录账号
+	*/
+		@ApiModelProperty(value = "若为企业管理员时的小程序登录账号")
+		private String enterpriseAccount;
+	/**
+	* 若为企业管理员时的小程序登录密码
+	*/
+		@ApiModelProperty(value = "若为企业管理员时的小程序登录密码")
+		private String enterprisePassword;
+
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/EnterpriseClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.enterprise.feign;
+
+import org.springblade.enterprise.entity.Enterprise;
+import org.springblade.enterprise.vo.EnterpriseVO;
+import org.springframework.stereotype.Component;
+import javax.validation.Valid;
+import java.util.List;
+
+@Component
+public class EnterpriseClientFallback implements IEnterpriseClient {
+            /**
+         * 详情
+         */
+        @Override
+        public EnterpriseVO detail(Enterprise enterprise) {
+            return null;
+        }
+
+        /**
+         * 查询 
+         */
+        @Override
+        public List<EnterpriseVO> list(Enterprise enterprise) {
+            return null;
+        }
+
+    
+
+        /**
+         * 新增 
+         */
+        @Override
+        public boolean save( Enterprise enterprise) {
+            return false;
+        }
+
+        /**
+         * 修改 
+         */
+        @Override
+        public boolean update( Enterprise enterprise) {
+            return false;
+        }
+
+        /**
+         * 新增或修改 
+         */
+        @Override
+        public boolean submit( Enterprise enterprise) {
+            return false;
+        }
+
+    
+        /**
+         * 删除 
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/IEnterpriseClient.java

@@ -0,0 +1,63 @@
+package org.springblade.enterprise.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.enterprise.entity.Enterprise;
+import org.springblade.enterprise.vo.EnterpriseVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *  Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-30
+ */
+@FeignClient(value = "cyzh-enterprise",path = "/feign/enterprise")
+public interface IEnterpriseClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    EnterpriseVO detail(Enterprise enterprise);
+
+	/**
+	 * 查询
+	 */
+	@GetMapping("/list")
+    List<EnterpriseVO> list(Enterprise enterprise);
+
+
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Enterprise enterprise);
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Enterprise enterprise);
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Enterprise enterprise);
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/IProjectClient.java

@@ -0,0 +1,63 @@
+package org.springblade.enterprise.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.enterprise.entity.Project;
+import org.springblade.enterprise.vo.ProjectVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *  Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-30
+ */
+@FeignClient(value = "cyzh-enterprise",path = "/feign/project")
+public interface IProjectClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    ProjectVO detail(Project project);
+
+	/**
+	 * 查询
+	 */
+	@GetMapping("/list")
+    List<ProjectVO> list(Project project);
+
+
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Project project);
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Project project);
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Project project);
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/IStaffClient.java

@@ -0,0 +1,63 @@
+package org.springblade.enterprise.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.enterprise.entity.Staff;
+import org.springblade.enterprise.vo.StaffVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *  Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-03-30
+ */
+@FeignClient(value = "cyzh-enterprise",path = "/feign/staff")
+public interface IStaffClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    StaffVO detail(Staff staff);
+
+	/**
+	 * 查询
+	 */
+	@GetMapping("/list")
+    List<StaffVO> list(Staff staff);
+
+
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Staff staff);
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Staff staff);
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Staff staff);
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/ProjectClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.enterprise.feign;
+
+import org.springblade.enterprise.entity.Project;
+import org.springblade.enterprise.vo.ProjectVO;
+import org.springframework.stereotype.Component;
+import javax.validation.Valid;
+import java.util.List;
+
+@Component
+public class ProjectClientFallback implements IProjectClient {
+            /**
+         * 详情
+         */
+        @Override
+        public ProjectVO detail(Project project) {
+            return null;
+        }
+
+        /**
+         * 查询 
+         */
+        @Override
+        public List<ProjectVO> list(Project project) {
+            return null;
+        }
+
+    
+
+        /**
+         * 新增 
+         */
+        @Override
+        public boolean save( Project project) {
+            return false;
+        }
+
+        /**
+         * 修改 
+         */
+        @Override
+        public boolean update( Project project) {
+            return false;
+        }
+
+        /**
+         * 新增或修改 
+         */
+        @Override
+        public boolean submit( Project project) {
+            return false;
+        }
+
+    
+        /**
+         * 删除 
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/StaffClientFallback.java

@@ -0,0 +1,62 @@
+package org.springblade.enterprise.feign;
+
+import org.springblade.enterprise.entity.Staff;
+import org.springblade.enterprise.vo.StaffVO;
+import org.springframework.stereotype.Component;
+import javax.validation.Valid;
+import java.util.List;
+
+@Component
+public class StaffClientFallback implements IStaffClient {
+            /**
+         * 详情
+         */
+        @Override
+        public StaffVO detail(Staff staff) {
+            return null;
+        }
+
+        /**
+         * 查询 
+         */
+        @Override
+        public List<StaffVO> list(Staff staff) {
+            return null;
+        }
+
+    
+
+        /**
+         * 新增 
+         */
+        @Override
+        public boolean save( Staff staff) {
+            return false;
+        }
+
+        /**
+         * 修改 
+         */
+        @Override
+        public boolean update( Staff staff) {
+            return false;
+        }
+
+        /**
+         * 新增或修改 
+         */
+        @Override
+        public boolean submit( Staff staff) {
+            return false;
+        }
+
+    
+        /**
+         * 删除 
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+    }

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/vo/EnterpriseVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.vo;
+
+import org.springblade.enterprise.entity.Enterprise;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "EnterpriseVO对象", description = "EnterpriseVO对象")
+public class EnterpriseVO extends Enterprise {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/vo/ProjectVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.vo;
+
+import org.springblade.enterprise.entity.Project;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ProjectVO对象", description = "ProjectVO对象")
+public class ProjectVO extends Project {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/vo/StaffVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.vo;
+
+import org.springblade.enterprise.entity.Staff;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "StaffVO对象", description = "StaffVO对象")
+public class StaffVO extends Staff {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/person-api/src/main/java/org/springblade/community/member/feign/IMemberClient.java

@@ -1,59 +0,0 @@
-package org.springblade.community.member.feign;
-
-import io.swagger.annotations.ApiParam;
-//import org.springblade.modules.member.entity.Member;
-//import org.springblade.modules.member.vo.MemberVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- *  Feign
- *
- * @author lianghanqiang
- * @since 2021-03-03
- */
-@FeignClient(value = "person",path = "/feign/member")
-public interface IMemberClient  {
-
-//	/**
-//	 * 详情
-//	 */
-//	@GetMapping("/detail")
-//    MemberVO detail(Member member);
-//
-//	/**
-//	 * 查询
-//	 */
-//	@GetMapping("/list")
-//    List<MemberVO> list(Member member);
-//
-//
-//
-//	/**
-//	 * 新增
-//	 */
-//	@PostMapping("/save")
-//	boolean save(@Valid @RequestBody Member member);
-//
-//	/**
-//	 * 修改
-//	 */
-//	@PostMapping("/update")
-//    boolean update(@Valid @RequestBody Member member);
-//
-//	/**
-//	 * 新增或修改
-//	 */
-//	@PostMapping("/submit")
-//    boolean submit(@Valid @RequestBody Member member);
-
-
-	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
-
-
-}

blade-service-api/person-api/src/main/java/org/springblade/community/member/feign/IWyAppMemberClient.java

@@ -1,59 +0,0 @@
-package org.springblade.community.member.feign;
-
-import io.swagger.annotations.ApiParam;
-//import org.springblade.modules.member.entity.WyAppMember;
-//import org.springblade.modules.member.vo.WyAppMemberVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- *  Feign
- *
- * @author lianghanqiang
- * @since 2021-03-03
- */
-@FeignClient(value = "person",path = "/feign/wyappmember")
-public interface IWyAppMemberClient  {
-
-	/**
-	 * 详情
-	 */
-//	@GetMapping("/detail")
-//    WyAppMemberVO detail(WyAppMember wyAppMember);
-//
-//	/**
-//	 * 查询
-//	 */
-//	@GetMapping("/list")
-//    List<WyAppMemberVO> list(WyAppMember wyAppMember);
-//
-//
-//
-//	/**
-//	 * 新增
-//	 */
-//	@PostMapping("/save")
-//	boolean save(@Valid @RequestBody WyAppMember wyAppMember);
-//
-//	/**
-//	 * 修改
-//	 */
-//	@PostMapping("/update")
-//    boolean update(@Valid @RequestBody WyAppMember wyAppMember);
-//
-//	/**
-//	 * 新增或修改
-//	 */
-//	@PostMapping("/submit")
-//    boolean submit(@Valid @RequestBody WyAppMember wyAppMember);
-//
-//
-	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
-
-
-}

blade-service-api/pom.xml

@@ -19,9 +19,10 @@
     <modules>
         <module>estate-api</module>
         <module>community-api</module>
-        <module>person-api</module>
+
         <module>grid-api</module>
         <module>system-expand-api</module>
+        <module>enterprise-api</module>
     </modules>
 
     <dependencies>

blade-service-api/system-expand-api/pom.xml

@@ -11,13 +11,6 @@
 
     <artifactId>system-expand-api</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-biz-common</artifactId>
-            <version>2.7.2.RELEASE</version>
-        </dependency>
-    </dependencies>
 
 
 </project>

blade-service-api/system-expand-api/src/main/java/org/springblade/system/expand/entity/OrgPosition.java

@@ -77,12 +77,7 @@ public class OrgPosition extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "所属机构id")
 		private Long orgId;
-	/**
-	* 视频云账号
-	*/
-		@ApiModelProperty(value = "视频云账号")
-		private String vcDeviceAccountName;
-	private String enterpriseIds;
+
 
 
 }

blade-service-api/system-expand-api/src/main/java/org/springblade/system/expand/feign/IOrgPositionClient.java

@@ -27,7 +27,7 @@ public interface IOrgPositionClient  {
     OrgPositionVO detail(OrgPosition orgPosition);
 
 	/**
-	 * 查询 
+	 * 查询
 	 */
 	@GetMapping("/list")
     List<OrgPositionVO> list(OrgPosition orgPosition);
@@ -35,29 +35,31 @@ public interface IOrgPositionClient  {
 
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	boolean save(@Valid @RequestBody OrgPosition orgPosition);
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
     boolean update(@Valid @RequestBody OrgPosition orgPosition);
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody OrgPosition orgPosition);
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
-	
+
+
+
 }

blade-service-api/system-expand-api/src/main/java/org/springblade/system/expand/util/QueryWrapperUtil.java

@@ -0,0 +1,65 @@
+package org.springblade.system.expand.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.system.expand.entity.OrgPosition;
+import org.springblade.system.expand.feign.IOrgPositionClient;
+import org.springblade.system.expand.vo.OrgPositionVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created By lidexi in 2021/3/30
+ **/
+public class QueryWrapperUtil<T> {
+
+	public  LambdaQueryWrapper<T> getBasicQueryWrapper(SFunction<T,String> function, T t, BladeUser bladeUser, IOrgPositionClient orgPositionClient) {
+		String deptId = bladeUser.getDeptId();
+		String[] deptIds = deptId.split(",");
+		LambdaQueryWrapper<T> wrapper = Condition.getQueryWrapper(t).lambda();
+		for (int i = 0; i < deptIds.length; i++) {
+			OrgPosition select = new OrgPosition();
+			select.setOrgId(Long.valueOf(deptIds[i]));
+			List<OrgPositionVO> list = orgPositionClient.list(select);
+			OrgPosition orgPosition = null;
+			if(list.size()>0){
+				orgPosition = list.get(0);
+			}else{
+				continue;
+			}
+			if (i == 0) {
+				wrapper.like(function,orgPosition.getOrgPosition());
+			}else{
+				wrapper.or().like(function,orgPosition.getOrgPosition());
+			}
+		}
+		return wrapper;
+	}
+
+
+	public LambdaQueryWrapper<T> getBasicQueryWrapperByMap(SFunction<T,String> function, Map map, T t, BladeUser bladeUser,IOrgPositionClient orgPositionClient) {
+		String deptId = bladeUser.getDeptId();
+		String[] deptIds = deptId.split(",");
+		LambdaQueryWrapper<T> wrapper = Condition.getQueryWrapper(map,t.getClass()).lambda();
+		for (int i = 0; i < deptIds.length; i++) {
+			OrgPosition select = new OrgPosition();
+			select.setOrgId(Long.valueOf(deptIds[i]));
+			List<OrgPositionVO> list = orgPositionClient.list(select);
+			OrgPosition orgPosition = null;
+			if(list.size()>0){
+				orgPosition = list.get(0);
+			}else{
+				continue;
+			}
+			if (i == 0) {
+				wrapper.like(function,orgPosition.getOrgPosition());
+			}else{
+				wrapper.or().like(function,orgPosition.getOrgPosition());
+			}
+		}
+		return wrapper;
+	}
+}

blade-service/community/pom.xml

@@ -66,6 +66,7 @@
             <artifactId>hutool-all</artifactId>
             <version>5.6.0</version>
         </dependency>
+
     </dependencies>
 
 </project>

blade-service/community/src/main/java/org/springblade/community/controller/AgencyController.java

@@ -16,17 +16,22 @@
  */
 package org.springblade.community.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
 import javax.validation.Valid;
 
+import  org.springblade.system.expand.util.*;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +54,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class AgencyController extends BladeController {
 
 	private final IAgencyService agencyService;
+	private final IOrgPositionClient orgPositionClient;
 
 	/**
 	 * 详情
@@ -62,19 +68,20 @@ public class AgencyController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入agency")
-	public R<IPage<AgencyVO>> list(Agency agency, Query query) {
-		IPage<Agency> pages = agencyService.page(Condition.getPage(query), Condition.getQueryWrapper(agency));
+	public R<IPage<AgencyVO>> list(Agency agency, Query query, BladeUser bladeUser) {
+		LambdaQueryWrapper<Agency> basicQueryWrapper = new QueryWrapperUtil<Agency>().getBasicQueryWrapper(Agency::getOrgPosition, agency, bladeUser, orgPositionClient);
+		IPage<Agency> pages = agencyService.page(Condition.getPage(query), basicQueryWrapper);
 		return R.data(AgencyWrapper.build().pageVO(pages));
 	}
 
 
 	/**
-	 * 自定义分页 
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +92,7 @@ public class AgencyController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +102,7 @@ public class AgencyController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +112,7 @@ public class AgencyController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -114,9 +121,9 @@ public class AgencyController extends BladeController {
 		return R.status(agencyService.saveOrUpdate(agency));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -125,5 +132,5 @@ public class AgencyController extends BladeController {
 		return R.status(agencyService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/community/src/main/java/org/springblade/community/controller/BuildingController.java

@@ -62,19 +62,20 @@ public class BuildingController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入building")
 	public R<IPage<BuildingVO>> list(Building building, Query query) {
+
 		IPage<Building> pages = buildingService.page(Condition.getPage(query), Condition.getQueryWrapper(building));
 		return R.data(BuildingWrapper.build().pageVO(pages));
 	}
 
 
 	/**
-	 * 自定义分页 
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +86,7 @@ public class BuildingController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +96,7 @@ public class BuildingController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +106,7 @@ public class BuildingController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -114,9 +115,9 @@ public class BuildingController extends BladeController {
 		return R.status(buildingService.saveOrUpdate(building));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -125,5 +126,5 @@ public class BuildingController extends BladeController {
 		return R.status(buildingService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

blade-service/person/pom.xml → blade-service/enterprise/pom.xml

@@ -3,13 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>BladeX-Biz</artifactId>
+        <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
         <version>2.7.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>persion</artifactId>
+    <artifactId>enterprise</artifactId>
+
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -37,12 +38,6 @@
             <artifactId>blade-core-auto</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-annotations</artifactId>
-            <version>2.7.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-annotations</artifactId>
@@ -50,19 +45,10 @@
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>persion-api</artifactId>
-            <version>2.7.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-biz-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
-            <scope>compile</scope>
+            <artifactId>enterprise-api</artifactId>
+            <version>${bladex.project.version}</version>
         </dependency>
     </dependencies>
+
+
 </project>

blade-service/person/src/main/java/org/springblade/community/PersonApplication.java → blade-service/enterprise/src/main/java/org/springblade/enterprise/EnterpriseApplication.java

@@ -1,14 +1,18 @@
-package org.springblade.community;
+package org.springblade.enterprise;
 
 import org.springblade.common.constant.ServicesName;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
+/**
+ * Created By lidexi in 2021/3/30
+ **/
 @SpringCloudApplication
 @EnableBladeFeign
-public class PersonApplication {
+public class EnterpriseApplication {
+
 	public static void main(String[] args) {
-		BladeApplication.run(ServicesName.PERSON_SERVICE,PersonApplication.class,args);
+		BladeApplication.run(ServicesName.ENTERPRISE_SERVICE,EnterpriseApplication.class,args);
 	}
 }

blade-service/enterprise/src/main/java/org/springblade/enterprise/controller/EnterpriseController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.enterprise.entity.Enterprise;
+import org.springblade.enterprise.vo.EnterpriseVO;
+import org.springblade.enterprise.wrapper.EnterpriseWrapper;
+import org.springblade.enterprise.service.IEnterpriseService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/enterprise")
+@Api(value = "", tags = "接口")
+public class EnterpriseController extends BladeController {
+
+	private final IEnterpriseService enterpriseService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入enterprise")
+	public R<EnterpriseVO> detail(Enterprise enterprise) {
+		Enterprise detail = enterpriseService.getOne(Condition.getQueryWrapper(enterprise));
+		return R.data(EnterpriseWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入enterprise")
+	public R<IPage<EnterpriseVO>> list(Enterprise enterprise, Query query) {
+		IPage<Enterprise> pages = enterpriseService.page(Condition.getPage(query), Condition.getQueryWrapper(enterprise));
+		return R.data(EnterpriseWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入enterprise")
+	public R<IPage<EnterpriseVO>> page(EnterpriseVO enterprise, Query query) {
+		IPage<EnterpriseVO> pages = enterpriseService.selectEnterprisePage(Condition.getPage(query), enterprise);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入enterprise")
+	public R save(@Valid @RequestBody Enterprise enterprise) {
+		return R.status(enterpriseService.save(enterprise));
+	}
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入enterprise")
+	public R update(@Valid @RequestBody Enterprise enterprise) {
+		return R.status(enterpriseService.updateById(enterprise));
+	}
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入enterprise")
+	public R submit(@Valid @RequestBody Enterprise enterprise) {
+		return R.status(enterpriseService.saveOrUpdate(enterprise));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(enterpriseService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/controller/ProjectController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.enterprise.entity.Project;
+import org.springblade.enterprise.vo.ProjectVO;
+import org.springblade.enterprise.wrapper.ProjectWrapper;
+import org.springblade.enterprise.service.IProjectService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/project")
+@Api(value = "", tags = "接口")
+public class ProjectController extends BladeController {
+
+	private final IProjectService projectService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入project")
+	public R<ProjectVO> detail(Project project) {
+		Project detail = projectService.getOne(Condition.getQueryWrapper(project));
+		return R.data(ProjectWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入project")
+	public R<IPage<ProjectVO>> list(Project project, Query query) {
+		IPage<Project> pages = projectService.page(Condition.getPage(query), Condition.getQueryWrapper(project));
+		return R.data(ProjectWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入project")
+	public R<IPage<ProjectVO>> page(ProjectVO project, Query query) {
+		IPage<ProjectVO> pages = projectService.selectProjectPage(Condition.getPage(query), project);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入project")
+	public R save(@Valid @RequestBody Project project) {
+		return R.status(projectService.save(project));
+	}
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入project")
+	public R update(@Valid @RequestBody Project project) {
+		return R.status(projectService.updateById(project));
+	}
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入project")
+	public R submit(@Valid @RequestBody Project project) {
+		return R.status(projectService.saveOrUpdate(project));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(projectService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/controller/StaffController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.enterprise.entity.Staff;
+import org.springblade.enterprise.vo.StaffVO;
+import org.springblade.enterprise.wrapper.StaffWrapper;
+import org.springblade.enterprise.service.IStaffService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/staff")
+@Api(value = "", tags = "接口")
+public class StaffController extends BladeController {
+
+	private final IStaffService staffService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入staff")
+	public R<StaffVO> detail(Staff staff) {
+		Staff detail = staffService.getOne(Condition.getQueryWrapper(staff));
+		return R.data(StaffWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入staff")
+	public R<IPage<StaffVO>> list(Staff staff, Query query) {
+		IPage<Staff> pages = staffService.page(Condition.getPage(query), Condition.getQueryWrapper(staff));
+		return R.data(StaffWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入staff")
+	public R<IPage<StaffVO>> page(StaffVO staff, Query query) {
+		IPage<StaffVO> pages = staffService.selectStaffPage(Condition.getPage(query), staff);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入staff")
+	public R save(@Valid @RequestBody Staff staff) {
+		return R.status(staffService.save(staff));
+	}
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入staff")
+	public R update(@Valid @RequestBody Staff staff) {
+		return R.status(staffService.updateById(staff));
+	}
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入staff")
+	public R submit(@Valid @RequestBody Staff staff) {
+		return R.status(staffService.saveOrUpdate(staff));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(staffService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/feign/EnterpriseClient.java

@@ -0,0 +1,90 @@
+package org.springblade.enterprise.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.enterprise.entity.Enterprise;
+import org.springblade.enterprise.vo.EnterpriseVO;
+import org.springblade.enterprise.wrapper.EnterpriseWrapper;
+import org.springblade.enterprise.service.IEnterpriseService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ *  client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-30
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/enterprise")
+
+public class EnterpriseClient implements IEnterpriseClient {
+
+    private final IEnterpriseService enterpriseService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public EnterpriseVO detail(Enterprise enterprise) {
+        Enterprise detail = enterpriseService.getOne(Condition.getQueryWrapper(enterprise));
+        return EnterpriseWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 
+     */
+    @Override
+    @GetMapping("/list")
+    public List<EnterpriseVO> list(Enterprise enterprise) {
+        return EnterpriseWrapper.build().listVO(enterpriseService.list(Condition.getQueryWrapper(enterprise)));
+        }
+
+    
+
+    /**
+     * 新增 
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Enterprise enterprise) {
+        return enterpriseService.save(enterprise);
+        }
+
+    /**
+     * 修改 
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Enterprise enterprise) {
+        return enterpriseService.updateById(enterprise);
+        }
+
+    /**
+     * 新增或修改 
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Enterprise enterprise) {
+        return enterpriseService.saveOrUpdate(enterprise);
+        }
+
+    
+    /**
+     * 删除 
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return enterpriseService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/feign/ProjectClient.java

@@ -0,0 +1,90 @@
+package org.springblade.enterprise.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.enterprise.entity.Project;
+import org.springblade.enterprise.vo.ProjectVO;
+import org.springblade.enterprise.wrapper.ProjectWrapper;
+import org.springblade.enterprise.service.IProjectService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ *  client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-30
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/project")
+
+public class ProjectClient implements IProjectClient {
+
+    private final IProjectService projectService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public ProjectVO detail(Project project) {
+        Project detail = projectService.getOne(Condition.getQueryWrapper(project));
+        return ProjectWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 
+     */
+    @Override
+    @GetMapping("/list")
+    public List<ProjectVO> list(Project project) {
+        return ProjectWrapper.build().listVO(projectService.list(Condition.getQueryWrapper(project)));
+        }
+
+    
+
+    /**
+     * 新增 
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Project project) {
+        return projectService.save(project);
+        }
+
+    /**
+     * 修改 
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Project project) {
+        return projectService.updateById(project);
+        }
+
+    /**
+     * 新增或修改 
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Project project) {
+        return projectService.saveOrUpdate(project);
+        }
+
+    
+    /**
+     * 删除 
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return projectService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/feign/StaffClient.java

@@ -0,0 +1,90 @@
+package org.springblade.enterprise.feign;
+
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.enterprise.entity.Staff;
+import org.springblade.enterprise.vo.StaffVO;
+import org.springblade.enterprise.wrapper.StaffWrapper;
+import org.springblade.enterprise.service.IStaffService;
+import org.springblade.core.boot.ctrl.BladeController;
+import java.util.List;
+/**
+ *  client
+ *
+ * @author lianghanqiang
+ * @since 2021-03-30
+ */
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/feign/staff")
+
+public class StaffClient implements IStaffClient {
+
+    private final IStaffService staffService;
+
+        /**
+     * 详情
+     */
+    @Override
+    @GetMapping("/detail")
+    public StaffVO detail(Staff staff) {
+        Staff detail = staffService.getOne(Condition.getQueryWrapper(staff));
+        return StaffWrapper.build().entityVO(detail);
+        }
+
+    /**
+     * 查询 
+     */
+    @Override
+    @GetMapping("/list")
+    public List<StaffVO> list(Staff staff) {
+        return StaffWrapper.build().listVO(staffService.list(Condition.getQueryWrapper(staff)));
+        }
+
+    
+
+    /**
+     * 新增 
+     */
+    @Override
+    @PostMapping("/save")
+    public boolean save(@Valid @RequestBody Staff staff) {
+        return staffService.save(staff);
+        }
+
+    /**
+     * 修改 
+     */
+    @Override
+    @PostMapping("/update")
+    public boolean update(@Valid @RequestBody Staff staff) {
+        return staffService.updateById(staff);
+        }
+
+    /**
+     * 新增或修改 
+     */
+    @Override
+    @PostMapping("/submit")
+    public boolean submit(@Valid @RequestBody Staff staff) {
+        return staffService.saveOrUpdate(staff);
+        }
+
+    
+    /**
+     * 删除 
+     */
+    @Override
+    @PostMapping("/remove")
+    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        return staffService.deleteLogic(Func.toLongList(ids));
+        }
+
+    
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/mapper/EnterpriseMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.mapper;
+
+import org.springblade.enterprise.entity.Enterprise;
+import org.springblade.enterprise.vo.EnterpriseVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public interface EnterpriseMapper extends BaseMapper<Enterprise> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param enterprise
+	 * @return
+	 */
+	List<EnterpriseVO> selectEnterprisePage(IPage page, EnterpriseVO enterprise);
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/mapper/EnterpriseMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.enterprise.mapper.EnterpriseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="enterpriseResultMap" type="org.springblade.enterprise.entity.Enterprise">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="enterprise_type" property="enterpriseType"/>
+        <result column="enterprise_name" property="enterpriseName"/>
+        <result column="credit_code" property="creditCode"/>
+        <result column="organization_code" property="organizationCode"/>
+        <result column="registered_capital" property="registeredCapital"/>
+        <result column="registered_address" property="registeredAddress"/>
+        <result column="representative" property="representative"/>
+        <result column="registered_date" property="registeredDate"/>
+        <result column="office_num" property="officeNum"/>
+        <result column="region" property="region"/>
+        <result column="logo" property="logo"/>
+        <result column="enterprise_introduce" property="enterpriseIntroduce"/>
+        <result column="business_license" property="businessLicense"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="agency_id" property="agencyId"/>
+        <result column="residential_id" property="residentialId"/>
+        <result column="org_position" property="orgPosition"/>
+    </resultMap>
+
+
+    <select id="selectEnterprisePage" resultMap="enterpriseResultMap">
+        select * from cyzh_enterprise where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/enterprise/src/main/java/org/springblade/enterprise/mapper/ProjectMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.mapper;
+
+import org.springblade.enterprise.entity.Project;
+import org.springblade.enterprise.vo.ProjectVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public interface ProjectMapper extends BaseMapper<Project> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param project
+	 * @return
+	 */
+	List<ProjectVO> selectProjectPage(IPage page, ProjectVO project);
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/mapper/ProjectMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.enterprise.mapper.ProjectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="projectResultMap" type="org.springblade.enterprise.entity.Project">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="name" property="name"/>
+        <result column="enterprise_id" property="enterpriseId"/>
+        <result column="investment_scale" property="investmentScale"/>
+        <result column="employment_number" property="employmentNumber"/>
+        <result column="research_number" property="researchNumber"/>
+        <result column="investment_amount" property="investmentAmount"/>
+        <result column="investment_return" property="investmentReturn"/>
+        <result column="investment_completed" property="investmentCompleted"/>
+        <result column="research_cost" property="researchCost"/>
+        <result column="taxes" property="taxes"/>
+        <result column="taward" property="taward"/>
+        <result column="taward_completed" property="tawardCompleted"/>
+        <result column="org_position" property="orgPosition"/>
+    </resultMap>
+
+
+    <select id="selectProjectPage" resultMap="projectResultMap">
+        select * from enterprise_project where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/enterprise/src/main/java/org/springblade/enterprise/mapper/StaffMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.mapper;
+
+import org.springblade.enterprise.entity.Staff;
+import org.springblade.enterprise.vo.StaffVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public interface StaffMapper extends BaseMapper<Staff> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param staff
+	 * @return
+	 */
+	List<StaffVO> selectStaffPage(IPage page, StaffVO staff);
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/mapper/StaffMapper.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.enterprise.mapper.StaffMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="staffResultMap" type="org.springblade.enterprise.entity.Staff">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="name" property="name"/>
+        <result column="real_name" property="realName"/>
+        <result column="email" property="email"/>
+        <result column="avatar" property="avatar"/>
+        <result column="phone" property="phone"/>
+        <result column="birthday" property="birthday"/>
+        <result column="face" property="face"/>
+        <result column="idcard" property="idcard"/>
+        <result column="sex" property="sex"/>
+        <result column="address" property="address"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="audit_status" property="auditStatus"/>
+        <result column="audit_opinion" property="auditOpinion"/>
+        <result column="enterprise_id" property="enterpriseId"/>
+        <result column="enterprise_name" property="enterpriseName"/>
+        <result column="agency_id" property="agencyId"/>
+        <result column="residential_id" property="residentialId"/>
+        <result column="open_id" property="openId"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="post_id" property="postId"/>
+        <result column="remarks" property="remarks"/>
+        <result column="create_type" property="createType"/>
+        <result column="org_position" property="orgPosition"/>
+        <result column="is_agency_manager" property="isAgencyManager"/>
+        <result column="agency_account" property="agencyAccount"/>
+        <result column="agency_password" property="agencyPassword"/>
+        <result column="is_enterprise_manager" property="isEnterpriseManager"/>
+        <result column="enterprise_account" property="enterpriseAccount"/>
+        <result column="enterprise_password" property="enterprisePassword"/>
+    </resultMap>
+
+
+    <select id="selectStaffPage" resultMap="staffResultMap">
+        select * from enterprise_staff where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/enterprise/src/main/java/org/springblade/enterprise/service/IEnterpriseService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.service;
+
+import org.springblade.enterprise.entity.Enterprise;
+import org.springblade.enterprise.vo.EnterpriseVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public interface IEnterpriseService extends BaseService<Enterprise> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param enterprise
+	 * @return
+	 */
+	IPage<EnterpriseVO> selectEnterprisePage(IPage<EnterpriseVO> page, EnterpriseVO enterprise);
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/service/IProjectService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.service;
+
+import org.springblade.enterprise.entity.Project;
+import org.springblade.enterprise.vo.ProjectVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public interface IProjectService extends BaseService<Project> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param project
+	 * @return
+	 */
+	IPage<ProjectVO> selectProjectPage(IPage<ProjectVO> page, ProjectVO project);
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/service/IStaffService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.service;
+
+import org.springblade.enterprise.entity.Staff;
+import org.springblade.enterprise.vo.StaffVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public interface IStaffService extends BaseService<Staff> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param staff
+	 * @return
+	 */
+	IPage<StaffVO> selectStaffPage(IPage<StaffVO> page, StaffVO staff);
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/service/impl/EnterpriseServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.service.impl;
+
+import org.springblade.enterprise.entity.Enterprise;
+import org.springblade.enterprise.vo.EnterpriseVO;
+import org.springblade.enterprise.mapper.EnterpriseMapper;
+import org.springblade.enterprise.service.IEnterpriseService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Service
+public class EnterpriseServiceImpl extends BaseServiceImpl<EnterpriseMapper, Enterprise> implements IEnterpriseService {
+
+	@Override
+	public IPage<EnterpriseVO> selectEnterprisePage(IPage<EnterpriseVO> page, EnterpriseVO enterprise) {
+		return page.setRecords(baseMapper.selectEnterprisePage(page, enterprise));
+	}
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/service/impl/ProjectServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.service.impl;
+
+import org.springblade.enterprise.entity.Project;
+import org.springblade.enterprise.vo.ProjectVO;
+import org.springblade.enterprise.mapper.ProjectMapper;
+import org.springblade.enterprise.service.IProjectService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Service
+public class ProjectServiceImpl extends BaseServiceImpl<ProjectMapper, Project> implements IProjectService {
+
+	@Override
+	public IPage<ProjectVO> selectProjectPage(IPage<ProjectVO> page, ProjectVO project) {
+		return page.setRecords(baseMapper.selectProjectPage(page, project));
+	}
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/service/impl/StaffServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.service.impl;
+
+import org.springblade.enterprise.entity.Staff;
+import org.springblade.enterprise.vo.StaffVO;
+import org.springblade.enterprise.mapper.StaffMapper;
+import org.springblade.enterprise.service.IStaffService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+@Service
+public class StaffServiceImpl extends BaseServiceImpl<StaffMapper, Staff> implements IStaffService {
+
+	@Override
+	public IPage<StaffVO> selectStaffPage(IPage<StaffVO> page, StaffVO staff) {
+		return page.setRecords(baseMapper.selectStaffPage(page, staff));
+	}
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/wrapper/EnterpriseWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.enterprise.entity.Enterprise;
+import org.springblade.enterprise.vo.EnterpriseVO;
+import java.util.Objects;
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public class EnterpriseWrapper extends BaseEntityWrapper<Enterprise, EnterpriseVO>  {
+
+	public static EnterpriseWrapper build() {
+		return new EnterpriseWrapper();
+ 	}
+
+	@Override
+	public EnterpriseVO entityVO(Enterprise enterprise) {
+		EnterpriseVO enterpriseVO = Objects.requireNonNull(BeanUtil.copy(enterprise, EnterpriseVO.class));
+
+		//User createUser = UserCache.getUser(enterprise.getCreateUser());
+		//User updateUser = UserCache.getUser(enterprise.getUpdateUser());
+		//enterpriseVO.setCreateUserName(createUser.getName());
+		//enterpriseVO.setUpdateUserName(updateUser.getName());
+
+		return enterpriseVO;
+	}
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/wrapper/ProjectWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.enterprise.entity.Project;
+import org.springblade.enterprise.vo.ProjectVO;
+import java.util.Objects;
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public class ProjectWrapper extends BaseEntityWrapper<Project, ProjectVO>  {
+
+	public static ProjectWrapper build() {
+		return new ProjectWrapper();
+ 	}
+
+	@Override
+	public ProjectVO entityVO(Project project) {
+		ProjectVO projectVO = Objects.requireNonNull(BeanUtil.copy(project, ProjectVO.class));
+
+		//User createUser = UserCache.getUser(project.getCreateUser());
+		//User updateUser = UserCache.getUser(project.getUpdateUser());
+		//projectVO.setCreateUserName(createUser.getName());
+		//projectVO.setUpdateUserName(updateUser.getName());
+
+		return projectVO;
+	}
+
+}

blade-service/enterprise/src/main/java/org/springblade/enterprise/wrapper/StaffWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.enterprise.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.enterprise.entity.Staff;
+import org.springblade.enterprise.vo.StaffVO;
+import java.util.Objects;
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2021-03-30
+ */
+public class StaffWrapper extends BaseEntityWrapper<Staff, StaffVO>  {
+
+	public static StaffWrapper build() {
+		return new StaffWrapper();
+ 	}
+
+	@Override
+	public StaffVO entityVO(Staff staff) {
+		StaffVO staffVO = Objects.requireNonNull(BeanUtil.copy(staff, StaffVO.class));
+
+		//User createUser = UserCache.getUser(staff.getCreateUser());
+		//User updateUser = UserCache.getUser(staff.getUpdateUser());
+		//staffVO.setCreateUserName(createUser.getName());
+		//staffVO.setUpdateUserName(updateUser.getName());
+
+		return staffVO;
+	}
+
+}

blade-service/enterprise/src/main/resources/application-dev.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 9522
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.enterprise.url}
+    username: ${blade.datasource.enterprise.username}
+    password: ${blade.datasource.enterprise.password}

blade-service/person/src/main/java/org/springblade/community/member/feign/MemberClient.java

@@ -1,88 +0,0 @@
-package org.springblade.community.member.feign;
-
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-//import org.springblade.modules.member.entity.Member;
-//import org.springblade.modules.member.vo.MemberVO;
-//import org.springblade.modules.member.wrapper.MemberWrapper;
-//import org.springblade.modules.member.service.IMemberService;
-
-/**
- *  client
- *
- * @author lianghanqiang
- * @since 2021-03-03
- */
-
-@AllArgsConstructor
-@RestController
-@RequestMapping("/feign/member")
-
-public class MemberClient implements IMemberClient {
-	@Override
-	public boolean remove(String ids) {
-		return false;
-	}
-
-//    private final IMemberService memberService;
-//
-//        /**
-//     * 详情
-//     */
-//    @Override
-//    @GetMapping("/detail")
-//    public MemberVO detail(Member member) {
-//        Member detail = memberService.getOne(Condition.getQueryWrapper(member));
-//        return MemberWrapper.build().entityVO(detail);
-//        }
-//
-//    /**
-//     * 查询
-//     */
-//    @Override
-//    @GetMapping("/list")
-//    public List<MemberVO> list(Member member) {
-//        return MemberWrapper.build().listVO(memberService.list(Condition.getQueryWrapper(member)));
-//        }
-//
-//
-//
-//    /**
-//     * 新增
-//     */
-//    @Override
-//    @PostMapping("/save")
-//    public boolean save(@Valid @RequestBody Member member) {
-//        return memberService.save(member);
-//        }
-//
-//    /**
-//     * 修改
-//     */
-//    @Override
-//    @PostMapping("/update")
-//    public boolean update(@Valid @RequestBody Member member) {
-//        return memberService.updateById(member);
-//        }
-//
-//    /**
-//     * 新增或修改
-//     */
-//    @Override
-//    @PostMapping("/submit")
-//    public boolean submit(@Valid @RequestBody Member member) {
-//        return memberService.saveOrUpdate(member);
-//        }
-//
-//
-//    /**
-//     * 删除
-//     */
-//    @Override
-//    @PostMapping("/remove")
-//    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-//        return memberService.deleteLogic(Func.toLongList(ids));
-//        }
-
-
-}

blade-service/person/src/main/java/org/springblade/community/member/feign/MemberClientFallback.java

@@ -1,60 +0,0 @@
-package org.springblade.community.member.feign;
-
-//import org.springblade.modules.member.entity.Member;
-//import org.springblade.modules.member.vo.MemberVO;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MemberClientFallback implements IMemberClient {
-//            /**
-//         * 详情
-//         */
-//        @Override
-//        public MemberVO detail(Member member) {
-//            return null;
-//        }
-//
-//        /**
-//         * 查询
-//         */
-//        @Override
-//        public List<MemberVO> list(Member member) {
-//            return null;
-//        }
-//
-//
-//
-//        /**
-//         * 新增
-//         */
-//        @Override
-//        public boolean save( Member member) {
-//            return false;
-//        }
-//
-//        /**
-//         * 修改
-//         */
-//        @Override
-//        public boolean update( Member member) {
-//            return false;
-//        }
-//
-//        /**
-//         * 新增或修改
-//         */
-//        @Override
-//        public boolean submit( Member member) {
-//            return false;
-//        }
-//
-//
-        /**
-         * 删除
-         */
-        @Override
-        public boolean remove( String ids) {
-            return false;
-        }
-
-    }

blade-service/person/src/main/java/org/springblade/community/member/feign/WyAppMemberClient.java

@@ -1,88 +0,0 @@
-package org.springblade.community.member.feign;
-
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-//import org.springblade.modules.member.entity.WyAppMember;
-//import org.springblade.modules.member.vo.WyAppMemberVO;
-//import org.springblade.modules.member.wrapper.WyAppMemberWrapper;
-//import org.springblade.modules.member.service.IWyAppMemberService;
-
-/**
- *  client
- *
- * @author lianghanqiang
- * @since 2021-03-03
- */
-
-@AllArgsConstructor
-@RestController
-@RequestMapping("/feign/wyappmember")
-
-public class WyAppMemberClient implements IWyAppMemberClient {
-	@Override
-	public boolean remove(String ids) {
-		return false;
-	}
-
-//    private final IWyAppMemberService wyAppMemberService;
-//
-//        /**
-//     * 详情
-//     */
-//    @Override
-//    @GetMapping("/detail")
-//    public WyAppMemberVO detail(WyAppMember wyAppMember) {
-//        WyAppMember detail = wyAppMemberService.getOne(Condition.getQueryWrapper(wyAppMember));
-//        return WyAppMemberWrapper.build().entityVO(detail);
-//        }
-//
-//    /**
-//     * 查询
-//     */
-//    @Override
-//    @GetMapping("/list")
-//    public List<WyAppMemberVO> list(WyAppMember wyAppMember) {
-//        return WyAppMemberWrapper.build().listVO(wyAppMemberService.list(Condition.getQueryWrapper(wyAppMember)));
-//        }
-//
-//
-//
-//    /**
-//     * 新增
-//     */
-//    @Override
-//    @PostMapping("/save")
-//    public boolean save(@Valid @RequestBody WyAppMember wyAppMember) {
-//        return wyAppMemberService.save(wyAppMember);
-//        }
-//
-//    /**
-//     * 修改
-//     */
-//    @Override
-//    @PostMapping("/update")
-//    public boolean update(@Valid @RequestBody WyAppMember wyAppMember) {
-//        return wyAppMemberService.updateById(wyAppMember);
-//        }
-//
-//    /**
-//     * 新增或修改
-//     */
-//    @Override
-//    @PostMapping("/submit")
-//    public boolean submit(@Valid @RequestBody WyAppMember wyAppMember) {
-//        return wyAppMemberService.saveOrUpdate(wyAppMember);
-//        }
-//
-//
-//    /**
-//     * 删除
-//     */
-//    @Override
-//    @PostMapping("/remove")
-//    public boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-//        return wyAppMemberService.deleteLogic(Func.toLongList(ids));
-//        }
-
-
-}

blade-service/person/src/main/java/org/springblade/community/member/feign/WyAppMemberClientFallback.java

@@ -1,60 +0,0 @@
-package org.springblade.community.member.feign;
-
-//import org.springblade.modules.member.entity.WyAppMember;
-//import org.springblade.modules.member.vo.WyAppMemberVO;
-import org.springframework.stereotype.Component;
-
-@Component
-public class WyAppMemberClientFallback implements IWyAppMemberClient {
-//            /**
-//         * 详情
-//         */
-//        @Override
-//        public WyAppMemberVO detail(WyAppMember wyAppMember) {
-//            return null;
-//        }
-//
-//        /**
-//         * 查询
-//         */
-//        @Override
-//        public List<WyAppMemberVO> list(WyAppMember wyAppMember) {
-//            return null;
-//        }
-//
-//
-//
-//        /**
-//         * 新增
-//         */
-//        @Override
-//        public boolean save( WyAppMember wyAppMember) {
-//            return false;
-//        }
-//
-//        /**
-//         * 修改
-//         */
-//        @Override
-//        public boolean update( WyAppMember wyAppMember) {
-//            return false;
-//        }
-//
-//        /**
-//         * 新增或修改
-//         */
-//        @Override
-//        public boolean submit( WyAppMember wyAppMember) {
-//            return false;
-//        }
-
-
-        /**
-         * 删除
-         */
-        @Override
-        public boolean remove( String ids) {
-            return false;
-        }
-
-    }

blade-service/person/src/main/resources/application-dev.yml

@@ -1,10 +0,0 @@
-#服务器端口
-server:
-  port: 9523
-
-#数据源配置
-spring:
-  datasource:
-    url: ${blade.datasource.person.url}
-    username: ${blade.datasource.person.username}
-    password: ${blade.datasource.person.password}

blade-service/pom.xml

@@ -19,9 +19,9 @@
     <modules>
         <module>estate</module>
         <module>community</module>
-        <module>person</module>
         <module>grid</module>
         <module>system-expand</module>
+        <module>enterprise</module>
     </modules>
 
     <dependencies>

blade-service/system-expand/src/main/java/org/springblade/system/expand/feign/CustomMenuClient.java

@@ -23,7 +23,6 @@ import java.util.List;
 @AllArgsConstructor
 @RestController
 @RequestMapping("/feign/custommenu")
-
 public class CustomMenuClient implements ICustomMenuClient {
 
     private final ICustomMenuService customMenuService;
@@ -39,7 +38,7 @@ public class CustomMenuClient implements ICustomMenuClient {
         }
 
     /**
-     * 查询 
+     * 查询
      */
     @Override
     @GetMapping("/list")
@@ -47,10 +46,10 @@ public class CustomMenuClient implements ICustomMenuClient {
         return CustomMenuWrapper.build().listVO(customMenuService.list(Condition.getQueryWrapper(customMenu)));
         }
 
-    
+
 
     /**
-     * 新增 
+     * 新增
      */
     @Override
     @PostMapping("/save")
@@ -59,7 +58,7 @@ public class CustomMenuClient implements ICustomMenuClient {
         }
 
     /**
-     * 修改 
+     * 修改
      */
     @Override
     @PostMapping("/update")
@@ -68,7 +67,7 @@ public class CustomMenuClient implements ICustomMenuClient {
         }
 
     /**
-     * 新增或修改 
+     * 新增或修改
      */
     @Override
     @PostMapping("/submit")
@@ -76,9 +75,9 @@ public class CustomMenuClient implements ICustomMenuClient {
         return customMenuService.saveOrUpdate(customMenu);
         }
 
-    
+
     /**
-     * 删除 
+     * 删除
      */
     @Override
     @PostMapping("/remove")
@@ -86,5 +85,5 @@ public class CustomMenuClient implements ICustomMenuClient {
         return customMenuService.deleteLogic(Func.toLongList(ids));
         }
 
-    
+
 }

blade-service/system-expand/src/main/java/org/springblade/system/expand/mapper/OrgPositionMapper.xml

@@ -20,8 +20,7 @@
         <result column="residential_id" property="residentialId"/>
         <result column="org_position" property="orgPosition"/>
         <result column="org_id" property="orgId"/>
-        <result column="vc_device_account_name" property="vcDeviceAccountName"/>
-        <result column="enterprise_ids" property="enterpriseIds"/>
+
     </resultMap>