修改油站信息，将油站信息合并到集团信息里边

Yijia-SaaS/yijia-admin/src/main/java/com/yijia/web/controller/system/SysDeptController.java

@@ -47,6 +47,14 @@ public class SysDeptController extends BaseController
         return AjaxResult.success(depts);
     }
 
+    @PreAuthorize("@ss.hasPermi('system:dept:listTree')")
+    @GetMapping("/listTree")
+    public AjaxResult listTree(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptListTree(dept);
+        return AjaxResult.success(depts);
+    }
+
     /**
      * 查询部门列表（排除节点）
      */

Yijia-SaaS/yijia-common/src/main/java/com/yijia/common/core/domain/entity/SysDept.java

@@ -50,10 +50,109 @@ public class SysDept extends BaseEntity
 
     /** 父部门名称 */
     private String parentName;
-    
+
+    /** 集团级别 */
+    private Integer jiBie;
+
+    /** 油站地址 */
+    private String deptAddress;
+
+    /** 油枪数量 */
+    private Long oilGunNum;
+
+    /** 油站照片 */
+    private String stationPic;
+
+    /** 油站经度 */
+    private String stationLongitude;
+
+    /** 油站纬度 */
+    private String stationLatitude;
+
+    /** 商户号 */
+    private String mno;
+
+    /** 小程序appid */
+    private String appId;
+
+    /** 油站小程序app_secret */
+    private String appSecret;
+
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
+    public String getDeptAddress() {
+        return deptAddress;
+    }
+
+    public void setDeptAddress(String deptAddress) {
+        this.deptAddress = deptAddress;
+    }
+
+    public Long getOilGunNum() {
+        return oilGunNum;
+    }
+
+    public void setOilGunNum(Long oilGunNum) {
+        this.oilGunNum = oilGunNum;
+    }
+
+    public String getStationPic() {
+        return stationPic;
+    }
+
+    public void setStationPic(String stationPic) {
+        this.stationPic = stationPic;
+    }
+
+    public String getStationLongitude() {
+        return stationLongitude;
+    }
+
+    public void setStationLongitude(String stationLongitude) {
+        this.stationLongitude = stationLongitude;
+    }
+
+    public String getStationLatitude() {
+        return stationLatitude;
+    }
+
+    public void setStationLatitude(String stationLatitude) {
+        this.stationLatitude = stationLatitude;
+    }
+
+    public String getMno() {
+        return mno;
+    }
+
+    public void setMno(String mno) {
+        this.mno = mno;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+
+    public Integer getJiBie() {
+        return jiBie;
+    }
+
+    public void setJiBie(Integer jiBie) {
+        this.jiBie = jiBie;
+    }
+
     public Long getDeptId()
     {
         return deptId;

Yijia-SaaS/yijia-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -21,10 +21,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 		<result property="jiBie" column="ji_bie" />
+		<result property="deptAddress"    column="dept_address"    />
+		<result property="oilGunNum"    column="oil_gun_num"    />
+		<result property="stationPic"    column="station_pic"    />
+		<result property="stationLongitude"    column="station_longitude"    />
+		<result property="stationLatitude"    column="station_latitude"    />
+		<result property="mno"    column="mno"    />
+		<result property="appId"    column="app_id"    />
+		<result property="appSecret"    column="app_secret"    />
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time ,d.ji_bie
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time ,d.ji_bie, d.dept_address, d.oil_gun_num, d.station_pic, d.station_longitude, d.station_latitude, d.mno, d.app_id, d.app_secret
         from sys_dept d
     </sql>
     
@@ -99,6 +107,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="jiBie != null">ji_bie,</if>
+			<if test="deptAddress != null">dept_address,</if>
+			<if test="oilGunNum != null">oil_gun_num,</if>
+			<if test="stationPic != null">station_pic,</if>
+			<if test="stationLongitude!= null">station_longitude,</if>
+			<if test="stationLatitude != null">station_latitude,</if>
+			<if test="mno != null">mno,</if>
+			<if test="appId != null">app_id,</if>
+			<if test="appSecret != null">app_secret,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -112,6 +128,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="jiBie != null">#{jiBie},</if>
+			<if test="deptAddress != null">#{deptAddress},</if>
+			<if test="oilGunNum != null">#{oilGunNum},</if>
+			<if test="stationPic != null">#{stationPic},</if>
+			<if test="stationLongitude!= null">#{stationLongitude},</if>
+			<if test="stationLatitude != null">#{stationLatitude},</if>
+			<if test="mno != null">#{mno},</if>
+			<if test="appId != null">#{appId},</if>
+			<if test="appSecret != null">#{appSecret},</if>
  			sysdate()
  		)
 	</insert>
@@ -129,6 +153,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="jiBie != null">ji_bie = #{jiBie},</if>
+			<if test="deptAddress!= null">dept_address = #{deptAddress},</if>
+			<if test="oilGunNum != null">oil_gun_num = #{oilGunNum},</if>
+			<if test="stationPic != null">station_pic = #{stationPic},</if>
+			<if test="stationLongitude!= null">station_longitude = #{stationLongitude},</if>
+			<if test="stationLatitude != null">station_latitude = #{stationLatitude},</if>
+			<if test="mno != null">mno = #{mno},</if>
+			<if test="appId != null">app_id = #{appId},</if>
+			<if test="appSecret != null">app_secret = #{appSecret},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}