bf

yiming
1 parent e45187ed
Showing 17 changed files with 213 additions and 53 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/dept/mapper/DeptMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/dept/service/IDeptService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineAddController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineExamineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLineKFK.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/mybatis/system/DeptMapper.xml
@@ -7,6 +7,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.project.system.dept.service.DeptServiceImpl;
+import com.ruoyi.project.system.user.domain.User;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,6 +33,9 @@ public class RyTask {
 	@Autowired
 	IBsthTLineService lineService;
+	@Autowired
+	DeptServiceImpl deptService;
+
 	public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
 		System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
 	}
@@ -111,6 +119,14 @@ public class RyTask {
 	public void getCarPlate() {
 		System.out.println("获取车辆自编号");
+		DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
+		ThreadContext.bind(manager);
 		lineService.getCarPlate();
 	}
+
+	public void updateSysDept(){
+		DefaultWebSecurityManager manager = new DefaultWebSecurityManager();
+		ThreadContext.bind(manager);
+		deptService.updateSysDept();
+	}
 }
 package com.ruoyi.project.system.dept.controller;
 import java.util.List;
+
+import cn.hutool.http.Header;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -197,4 +203,8 @@ public class DeptController extends BaseController
         List<Ztree> ztrees = deptService.roleDeptTreeData(role);
         return ztrees;
     }
+
+
+
+
 }
@@ -47,6 +47,9 @@ public class Dept extends BaseEntity
     /** 父部门名称 */
     private String parentName;
+    private String code;
+
+    private String id;
     public Long getDeptId()
     {
         return deptId;
@@ -163,6 +166,22 @@ public class Dept extends BaseEntity
         this.parentName = parentName;
     }
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -114,4 +114,6 @@ public interface DeptMapper
      * @return 子部门数
      */
     public int selectNormalChildrenDeptById(Long deptId);
+
+    public Dept selectDeptByCode(@Param("code") String code);
 }
@@ -3,6 +3,13 @@ package com.ruoyi.project.system.dept.service;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
+import cn.hutool.http.Header;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.project.system.user.domain.User;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,8 +65,7 @@ public class DeptServiceImpl implements IDeptService
     /**
      * 查询部门管理树（排除下级）
-     * 
-     * @param deptId 部门ID
+     *
      * @return 所有部门信息
      */
     @Override
@@ -201,7 +207,8 @@ public class DeptServiceImpl implements IDeptService
         {
             throw new BusinessException("部门停用，不允许新增");
         }
-        dept.setCreateBy(ShiroUtils.getLoginName());
+        String name=ShiroUtils.getSysUser()==null?"admin":ShiroUtils.getLoginName();
+        dept.setCreateBy(name);
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         return deptMapper.insertDept(dept);
     }
@@ -225,7 +232,8 @@ public class DeptServiceImpl implements IDeptService
             dept.setAncestors(newAncestors);
             updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
         }
-        dept.setUpdateBy(ShiroUtils.getLoginName());
+        String name=ShiroUtils.getSysUser()==null?"admin":ShiroUtils.getLoginName();
+        dept.setCreateBy(name);
         int result = deptMapper.updateDept(dept);
         if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
         {
@@ -330,4 +338,77 @@ public class DeptServiceImpl implements IDeptService
         }
         return UserConstants.DEPT_NAME_UNIQUE;
     }
+
+    @Override
+    public Dept selectDeptByCode(String code) {
+        return deptMapper.selectDeptByCode(code);
+    }
+
+    public void updateSysDept() {
+        //获取所有部门信息
+        JSONObject para = new JSONObject();
+        para.put("organizationId", "");
+        String deptStr = HttpRequest.post("http://180.169.154.251:8082/businessCenter/organizationInfo/queryOrgUserTreeList")
+                .header(Header.ACCEPT, "application/json").header("userName", "tuohua00001").
+                header("password", "8602daa59fdd3dcc648c206e334fc268").form(para)
+                .execute().body();
+        JSONObject jsonObject = JSON.parseObject(deptStr);
+        JSONArray dataArr = jsonObject.getJSONArray("data");
+        for (int i = 0; i < dataArr.size(); i++) {
+            Dept sysDept = this.selectDeptByCode(dataArr.getJSONObject(i).getString("code"));
+            this.updateDept(getSysDept(sysDept, dataArr.getJSONObject(i), dataArr.getJSONObject(i).getString("code"), 0, 0));
+            if (dataArr.getJSONObject(i).containsKey("children")) {
+                synchronousDeptData(dataArr.getJSONObject(i).getJSONArray("children"), 100);
+            }
+        }
+    }
+
+    /**
+     * 同步部门数据
+     *
+     * @param parentId  父级id
+     * @param jsonArray
+     */
+    public void synchronousDeptData(JSONArray jsonArray, long parentId) {
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject jsonObject = jsonArray.getJSONObject(i);
+            if (jsonObject.getString("code") == null) {
+                continue;
+            }
+            Dept sysDept = this.selectDeptByCode(jsonObject.getString("code"));
+            if (sysDept != null && sysDept.getDeptId() != null) {
+                this.updateDept(getSysDept(sysDept, jsonObject, jsonObject.getString("code"), i, parentId));
+            }
+            if (sysDept == null) {
+                sysDept = getSysDept(new Dept(), jsonObject, jsonObject.getString("code"), i, parentId);
+                this.insertDept(sysDept);
+            }
+            if (jsonObject.containsKey("children") && "1".equals(jsonObject.getString("type"))) {
+                synchronousDeptData(jsonObject.getJSONArray("children"), sysDept.getDeptId());
+            }
+        }
+    }
+
+
+    /**
+     * 获取新对象
+     *
+     * @param sysDept
+     * @param jsonObject
+     * @param order
+     * @param parentId
+     * @return
+     */
+    public Dept getSysDept(Dept sysDept, JSONObject jsonObject, String code, int order, long parentId) {
+        sysDept.setCode(code);
+        sysDept.setDeptName(jsonObject.getString("label"));
+        sysDept.setOrderNum(String.valueOf(order));
+        sysDept.setStatus("0");
+        sysDept.setDelFlag("0");
+        sysDept.setParentId(parentId);
+        sysDept.setUpdateBy(" ");
+        sysDept.setId(jsonObject.getString("id"));
+        return sysDept;
+    }
+
 }
@@ -107,4 +107,13 @@ public interface IDeptService
      * @return 结果
      */
     public String checkDeptNameUnique(Dept dept);
+
+    /**
+     * 根据Code查询
+     * @param code
+     * @return
+     */
+    public Dept selectDeptByCode(String code);
+
+    void updateSysDept();
 }
@@ -10,6 +10,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
 import com.ruoyi.project.system.line.domain.BsthTLine;
+import com.ruoyi.project.system.line.domain.Company;
 import com.ruoyi.project.system.line.service.IBsthTLineService;
 import com.ruoyi.project.system.user.domain.User;
 import com.ruoyi.project.system.user.service.IUserService;
@@ -59,7 +60,7 @@ public class BsthTLineAddController extends BaseController
     {
         ModelAndView mv=new ModelAndView(prefix + "/line");
-        List<Map> companyList=bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mv.addObject("companyList",companyList);
         return mv;
     }
@@ -84,7 +85,7 @@ public class BsthTLineAddController extends BaseController
     public ModelAndView add()
     {
         ModelAndView mv=new ModelAndView(prefix + "/add");
-        List<Map> companyList=bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mv.addObject("companyList",companyList);
         return mv;
     }
@@ -129,7 +130,7 @@ public class BsthTLineAddController extends BaseController
     public String edit(@PathVariable("id") Long id, ModelMap mmap)
     {
         BsthTLine bsthTLine = bsthTLineService.selectBsthTLineExamineById(id);
-        List<Map> companyList=bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mmap.put("companyList",companyList);
         mmap.put("bsthTLine", bsthTLine);
         return prefix + "/edit";
@@ -11,6 +11,7 @@ import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
 import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.domain.BsthTLineKFK;
+import com.ruoyi.project.system.line.domain.Company;
 import com.ruoyi.project.system.line.service.IBsthTLineService;
 import com.ruoyi.project.system.user.domain.User;
 import com.ruoyi.project.system.user.service.IUserService;
@@ -58,7 +59,7 @@ public class BsthTLineController extends BaseController
     public ModelAndView line()
     {
         ModelAndView mv=new ModelAndView(prefix + "/line");
-        List<Map> companyList=bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mv.addObject("companyList",companyList);
         return mv;
     }
@@ -298,7 +299,7 @@ public class BsthTLineController extends BaseController
     {
         BsthTLine bsthTLine=new BsthTLine();
         List<BsthTLine> list = bsthTLineService.selectBsthTLineList(bsthTLine);
-        List<Map> companyList = bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         List<BsthTLineKFK> bsthTLineKFKS=new ArrayList<>();
         for (BsthTLine tLine : list) {
             BsthTLineKFK bsthTLineKFK=new BsthTLineKFK(tLine,companyList);
@@ -9,6 +9,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.dict.service.IDictDataService;
 import com.ruoyi.project.system.line.domain.BsthTLine;
+import com.ruoyi.project.system.line.domain.Company;
 import com.ruoyi.project.system.line.service.IBsthTLineService;
 import com.ruoyi.project.system.user.service.IUserService;
@@ -51,7 +52,7 @@ public class BsthTLineExamineController extends BaseController
     {
         ModelAndView mv=new ModelAndView(prefix + "/line");
-        List<Map> companyList=bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mv.addObject("companyList",companyList);
         return mv;
     }
@@ -76,7 +77,7 @@ public class BsthTLineExamineController extends BaseController
     {
         BsthTLine bsthTLine = bsthTLineService.selectBsthTLineExamineById(id);
         mmap.put("bsthTLine", bsthTLine);
-        List<Map> companyList=bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mmap.put("companyList",companyList);
         return prefix + "/detail";
     }
@@ -4,6 +4,7 @@ package com.ruoyi.project.system.line.controller;
 import java.util.List;
 import java.util.Map;
+import com.ruoyi.project.system.line.domain.Company;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -55,7 +56,7 @@ public class BsthTLineHistoryController extends BaseController
     {
         ModelAndView mv=new ModelAndView(prefix + "/line");
-        List<Map> companyList=bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mv.addObject("companyList",companyList);
         return mv;
     }
@@ -89,7 +90,7 @@ public class BsthTLineHistoryController extends BaseController
         boolean flag=bsthTLineService.selectHistoryByLineNameAndUpdateStatus(bsthTLine)!=null?true:false;
         mmap.put("flag",flag);
         mmap.put("bsthTLine", bsthTLine);
-        List<Map> companyList=bsthTLineService.selectCompany();
+        List<Company> companyList=bsthTLineService.selectCompany(new Company());
         mmap.put("companyList",companyList);
         return prefix + "/edit";
     }
@@ -193,7 +193,7 @@ public class BsthTLineKFK
     public BsthTLineKFK(){
     }
-    public BsthTLineKFK(BsthTLine bsthTLine, List<Map> companyList) {
+    public BsthTLineKFK(BsthTLine bsthTLine, List<Company> companyList) {
         try {
             Field[] fields=BsthTLineKFK.class.getDeclaredFields();
             for(Field f : fields) {
@@ -207,9 +207,9 @@ public class BsthTLineKFK
                }
             }
             this.fCompany=bsthTLine.getfCompany();
-            for (Map map : companyList) {
-                String fc=map.get("fCompany").toString();
-                String id=map.get("companyID").toString();
+            for (Company company : companyList) {
+                String fc=company.getfCompany();
+                String id=company.getCompanyID();
                 if (fc.equals(this.company+"本部")){
                     this.companyID=id;
                 }if(fc.equals(this.fCompany)){
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import com.ruoyi.project.system.line.domain.BsthTLine;
+import com.ruoyi.project.system.line.domain.Company;
 import com.ruoyi.project.system.line.domain.LineHistoryReport;
 import org.apache.ibatis.annotations.Mapper;
@@ -68,7 +69,7 @@ public interface BsthTLineMapper
 	int deleteBsthTLineHistoryById(Long id);
-	List<Map> selectCompany();
+	List<Company> selectCompany(Company company);
 	List<BsthTLine> selectBsthTLineListAndExamine(BsthTLine bsthTLine);
@@ -5,6 +5,7 @@ import java.util.Map;
 import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.domain.BsthTLineKFK;
+import com.ruoyi.project.system.line.domain.Company;
 import com.ruoyi.project.system.line.domain.LineHistoryReport;
 /**
@@ -58,7 +59,7 @@ public interface IBsthTLineService
 	int deleteBsthTLineHistoryById(Long id);
-	List<Map> selectCompany();
+	List<Company> selectCompany(Company company);
 	boolean lineNameIsExistInBsthTLine(String lineName);
@@ -10,9 +10,11 @@ import cn.hutool.json.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
 import com.ruoyi.project.system.line.domain.BsthTLineKFK;
+import com.ruoyi.project.system.line.domain.Company;
 import com.ruoyi.project.system.line.domain.LineHistoryReport;
 import com.ruoyi.project.system.user.domain.User;
 import org.slf4j.Logger;
@@ -69,6 +71,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
      * @return 【请填写功能名称】
      */
     @Override
+	@DataScope(deptAlias = "b")
     public List<BsthTLine> selectBsthTLineList(BsthTLine bsthTLine)
     {
         return bsthTLineMapper.selectBsthTLineList(bsthTLine);
@@ -91,6 +94,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 	@Override
+	@DataScope(deptAlias = "b")
 	public List<BsthTLine> selectBsthTLineHistoryList(BsthTLine bsthTLine) {
 		return bsthTLineMapper.selectBsthTLineHistoryList(bsthTLine);
 	}
@@ -135,6 +139,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 	@Override
+	@DataScope(deptAlias = "b")
 	public List<BsthTLine> selectBsthTLineExamineList(BsthTLine bsthTLine)
 	{
 		return bsthTLineMapper.selectBsthTLineExamineList(bsthTLine);
@@ -186,7 +191,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 					bsthTLineMapper.deleteBsthTLineExamineById(new String[]{bsthTLine.getId().toString()});
 					//kafka
-					List<Map> companyList=this.selectCompany();
+					List<Company> companyList=this.selectCompany(new Company());
 					BsthTLineKFK bsthTLineKFK=new BsthTLineKFK(bl,companyList);
 					bsthTLineKFK.setOperationType("insert");
 					this.sendKFK(bsthTLineKFK);
@@ -228,7 +233,7 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 					//删除审核表记录
 					bsthTLineMapper.deleteBsthTLineExamineById(new String[]{String.valueOf(id)});
 					//kafka
-					List<Map> companyList=this.selectCompany();
+					List<Company> companyList=this.selectCompany(new Company());
 					BsthTLineKFK bsthTLineKFK=new BsthTLineKFK(bl,companyList);
 					bsthTLineKFK.setOperationType("update");
 					this.sendKFK(bsthTLineKFK);
@@ -272,8 +277,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 	}
 	@Override
-	public List<Map> selectCompany(){
-		return bsthTLineMapper.selectCompany();
+	@DataScope(deptAlias = "c")
+	public List<Company> selectCompany(Company company){
+		return bsthTLineMapper.selectCompany(company);
 	}
 	public static Date initDateByDay(){
@@ -5,6 +5,8 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import cn.hutool.http.Header;
+import cn.hutool.http.HttpRequest;
 import com.ruoyi.common.utils.security.ShiroUtils;
 import com.ruoyi.project.system.user.service.IUserService;
 import com.ruoyi.project.system.user.service.UserServiceImpl;
@@ -100,7 +102,7 @@ public class LoginController extends BaseController
                 JSONObject dataJson = jsonObject.getJSONObject("data");
-
+                System.out.println(dataJson);
                 Assert.notNull(dataJson, "获取用户信息异常");
@@ -127,7 +129,7 @@ public class LoginController extends BaseController
-                login("bus123","bus123",false);
+                login("admin","admin123",false);
                 user = getSysUser();
                 user.setToken(token);
 //    	        user.setPermissions(permissionService.getMenuPermission());
@@ -270,4 +272,7 @@ public class LoginController extends BaseController
     {
         return "error/unauth";
     }
+
+
+
 }
@@ -78,32 +78,16 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</resultMap>
-	<!--<resultMap type="LineEditReport" id="LineEditReportResult">
-		<result property="id" column="id" />
-		<result property="lineName" column="line_name" />
-		<result property="company" column="company" />
-		<result property="lineDistance" column="line_distance" />
-		<result property="vehiclesNumber" column="vehicles_number" />
-		<result property="numberPerson" column="number_person" />
-		<result property="lineDistanceBefore" column="line_distance_before" />
-		<result property="vehiclesNumberBefore" column="vehicles_number_before" />
-		<result property="numberPersonBefore" column="number_person_before" />
-		<result property="createTime" column="create_time" />
-		<result property="lineUpdateType" column="line_update_type" />
-		<result property="files" column="files" />
-	</resultMap>
--->
-
 	<sql id="selectBsthTLineVo">
-		select * from bsth_t_line
+		select * from bsth_t_line b
 	</sql>
 	<sql id="selectBsthTLineExamineVo">
-		select * from bsth_t_line_examine
+		select * from bsth_t_line_examine b
 	</sql>
 	<sql id="selectBsthTLineHistoryVo">
-		select * from bsth_t_line_history
+		select * from bsth_t_line_history b
 	</sql>
 	<select id="selectBsthTLineList" parameterType="BsthTLine" resultMap="BsthTLineResult">
@@ -171,7 +155,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="lineUpdateType != null  and lineUpdateType != ''"> and  line_update_type= #{lineUpdateType}</if>
 			<if test="revenueType != null  and revenueType != ''"> and revenue_type= #{revenueType}</if>
 			<if test="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
-
+			${params.dataScope}
 		</where>
 		order by id desc
 	</select>
@@ -547,6 +531,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="examineType != null  and examineType != ''"> and examine_type = #{examineType}</if>
 			<if test="createTimeStr != null  and createTimeStr != ''"> and create_time >= #{createTimeStr}</if>
 			<if test="createTimeEnd != null  and createTimeEnd != ''"> and create_time &lt;= #{createTimeEnd}</if>
+			${params.dataScope}
 		</where>
 		order by id desc
 	</select>
@@ -861,6 +846,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="historyId != null  and historyId != ''"> and history_id is not null</if>
 			<if test="updateStatus != null  and updateStatus != ''"> and update_status #{updateStatus}</if>
 			<if test="lineUpdateType != null  and lineUpdateType != ''"> and line_update_type =#{lineUpdateType}</if>
+			${params.dataScope}
 		</where>
 		order by id desc
 	</select>
@@ -1312,8 +1298,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		delete from bsth_t_line_history where id=#{id}
 	</delete>
-	<select id="selectCompany" resultType="map">
-		select * from bsth_company
+	<select id="selectCompany" parameterType="com.ruoyi.project.system.line.domain.Company" resultType="com.ruoyi.project.system.line.domain.Company">
+		select * from bsth_company c
+		<where>
+			${params.dataScope}
+		</where>
 	</select>
@@ -6,6 +6,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	<resultMap type="Dept" id="DeptResult">
 		<id     property="deptId"     column="dept_id"     />
+		<result property="code" column="code" />
+		<result property="id" column="id" />
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
 		<result property="deptName"   column="dept_name"   />
@@ -23,7 +25,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</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 
+        select d.dept_id,d.code,d.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
         from sys_dept d
     </sql>
@@ -41,6 +43,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <if test="parentId != null and parentId != 0">
 			AND parent_id = #{parentId}
 		</if>
+		<if test="code != null and code != ''">
+			AND code = #{code}
+		</if>
+		<if test="id != null and id != ''">
+			AND id = #{id}
+		</if>
 		<if test="deptName != null and deptName != ''">
 			AND dept_name like concat('%', #{deptName}, '%')
 		</if>
@@ -69,10 +77,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	</select>
 	<select id="selectDeptById" parameterType="Long" resultMap="DeptResult">
-		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
-			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
-		from sys_dept d
-		where d.dept_id = #{deptId}
+		<include refid="selectDeptVo"/>
+		where dept_id = #{deptId}
 	</select>
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="DeptResult">
@@ -83,7 +89,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
 	</select>
-	<insert id="insertDept" parameterType="Dept">
+	<insert id="insertDept" parameterType="Dept" useGeneratedKeys="true" keyProperty="deptId">
  		insert into sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
@@ -95,6 +101,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			<if test="email != null and email != ''">email,</if>
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+			<if test="code != null and code != ''">code,</if>
+			<if test="id != null and id != ''">id,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -107,6 +115,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="code != null and code != ''">#{code},</if>
+			<if test="id != null and id != ''">#{id},</if>
  			sysdate()
  		)
 	</insert>
@@ -123,6 +133,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  			<if test="email != null">email = #{email},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="code != null and code != ''">code = #{code},</if>
+			<if test="id != null and id != ''">id = #{id},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}
@@ -155,4 +167,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  	    where dept_id in (${ancestors})
 	</update>
+	<select id="selectDeptByCode" parameterType="String" resultMap="DeptResult">
+		<include refid="selectDeptVo"/>
+		where d.code = #{code}
+	</select>
+
 </mapper> 
 \ No newline at end of file