新增公司

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java

@@ -113,6 +113,8 @@ public class SysDept extends BaseEntity {
      */
     private String roleName;
 
+    private String keyWord;
+
     public void setCity(String city) {
         this.city = city;
     }
@@ -190,6 +192,14 @@ public class SysDept extends BaseEntity {
         this.roleName = roleName;
     }
 
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
     /**
      * 子部门
      */

bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/SafeUtil.java

@@ -63,9 +63,9 @@ public class SafeUtil {
      * @return 如果包含特殊脚本字符返回true，否则返回false
      */
     public static boolean checkScript(String mark) {
-        if (mark != null && !"".equals(mark)) {
+//        if (mark != null && !"".equals(mark)) {
-            return match(SAFE_SCRIPT_PATTERN, mark.toLowerCase().trim());
+//            return match(SAFE_SCRIPT_PATTERN, mark.toLowerCase().trim());
-        }
+//        }
         return false;
     }
 

bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/MimeTypeUtils.java

@@ -28,7 +28,7 @@ public class MimeTypeUtils
 
     public static final String[] DEFAULT_ALLOWED_EXTENSION = {
             // 图片
-            "bmp", "gif", "jpg", "jpeg", "png",
+            "bmp", "gif", "jpg", "jpeg", "png", "svg",
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx","csv", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件

bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysDeptController.java

@@ -1,7 +1,9 @@
 package com.bonus.system.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.common.security.annotation.InnerAuth;
@@ -58,6 +60,20 @@ public class SysDeptController extends BaseController
         return error("系统异常");
     }
 
+    @GetMapping("/deptList")
+    @SysLog(title = "运营人员获取公司列表", businessType = OperaType.QUERY,logType = 0,module = "系统管理->部门管理")
+    public TableDataInfo deptList(SysDept dept) {
+        List<SysDept> deptList = new ArrayList<>();
+        try{
+            startPage();
+            deptList = deptService.getDeptList(dept);
+            return getDataTable(deptList);
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return getDataTableError(deptList);
+    }
+
     /**
      * 查询部门列表（排除节点）
      */

bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysDeptMapper.java

@@ -21,6 +21,8 @@ public interface SysDeptMapper
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
+    List<SysDept> getDeptList(SysDept dept);
+
     /**
      * 查询部门人员树列表
      *

bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysDeptService.java

@@ -20,6 +20,8 @@ public interface ISysDeptService
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
+    public List<SysDept> getDeptList(SysDept dept);
+
     /**
      * 查询部门树结构信息
      * 

bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java

@@ -87,6 +87,11 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.selectDeptList(dept);
     }
 
+    @Override
+    public List<SysDept> getDeptList(SysDept dept) {
+        return deptMapper.getDeptList(dept);
+    }
+
     /**
      * 查询部门树结构信息
      *

bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -72,6 +72,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by d.parent_id, d.order_num
     </select>
 
+	<select id="getDeptList" resultType="com.bonus.system.api.domain.SysDept">
+		select * from sys_dept sd where parent_id='0'
+		<if test="keyWord != null  and keyWord != ''">
+			and sd.dept_name like concat('%', #{keyWord}, '%')
+		</if>
+	</select>
+
 	<select id="selectDeptUserList" resultType="com.bonus.system.api.domain.SysDept">
 		SELECT
 			d.dept_id AS deptId,
@@ -146,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
 
-    <insert id="insertDept" parameterType="com.bonus.system.api.domain.SysDept">
+    <insert id="insertDept" parameterType="com.bonus.system.api.domain.SysDept" 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>