Browse Source

部门开发中

anderx 3 years ago
parent
commit
7d65c26288

+ 0 - 14
src/main/java/com/goafanti/admin/controller/AdminDepartmentApiController.java

@@ -85,18 +85,4 @@ public class AdminDepartmentApiController extends CertifyApiController {
 		res.setData(departmentService.getWorkingHours(depId));
 		return res;
 	}
-
-
-	/**
-	 * 工作时间列表
-	 */
-	@RequestMapping(value = "/selectAllDep", method = RequestMethod.GET)
-	public Result selectAllDep() {
-		Result res = new Result();
-
-		res.setData(departmentService.selectAllDep());
-		return res;
-	}
-
-
 }

+ 0 - 1
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -43,5 +43,4 @@ public interface DepartmentService {
 
 	List<Department> getLowerDep(String depIds);
 
-	List<DepartmentComboBox> selectAllDep();
 }

+ 1 - 4
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -146,9 +146,6 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 	}
 
 
-	@Override
-	public List<DepartmentComboBox> selectAllDep() {
-		return null;
-	}
+
 
 }

+ 3 - 4
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml

@@ -304,13 +304,12 @@
     select
     id,name,dep_no as depNo
     from department
-    where
-    status ='0'
+    where status ='0'
+    and lvl=3
       <if test="hideSign != null ">
     and hide_sign= #{hideSign}
       </if>
-    order by CONVERT (name USING gbk)
-
+    order by depNo
   </select>
   <insert id="insert1" parameterType="com.goafanti.organization.bo.OrganizationListOut">
     insert into department(