소스 검색

任务分配

xiongzhu 7 년 전
부모
커밋
7b7a0a4383
3개의 변경된 파일6개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 2
      awesome-admin.iml
  2. 1 1
      src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml
  3. 1 1
      src/test/java/UserServiceTest.java

+ 4 - 2
awesome-admin.iml

@@ -30,6 +30,8 @@
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.11" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.5.RELEASE" level="project" />
@@ -55,7 +57,7 @@
     <orderEntry type="module-library">
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_141/lib/jconsole.jar!/" />
+          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home/lib/jconsole.jar!/" />
         </CLASSES>
         </CLASSES>
         <JAVADOC />
         <JAVADOC />
         <SOURCES />
         <SOURCES />
@@ -64,7 +66,7 @@
     <orderEntry type="module-library">
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_141/lib/tools.jar!/" />
+          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_162.jdk/Contents/Home/lib/tools.jar!/" />
         </CLASSES>
         </CLASSES>
         <JAVADOC />
         <JAVADOC />
         <SOURCES />
         <SOURCES />

+ 1 - 1
src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -433,7 +433,7 @@
         FROM
         FROM
             user_info
             user_info
         WHERE
         WHERE
-            role_id = ( SELECT role_id FROM user_info WHERE id = #{userId} )
+            depart_id = ( SELECT depart_id FROM user_info WHERE id = #{userId} )
             AND FIND_IN_SET( 9, role_id )
             AND FIND_IN_SET( 9, role_id )
             AND del_flag = 'N'
             AND del_flag = 'N'
     </select>
     </select>

+ 1 - 1
src/test/java/UserServiceTest.java

@@ -16,7 +16,7 @@ public class UserServiceTest {
 
 
     @Test
     @Test
     public void testFindDepartLeader() {
     public void testFindDepartLeader() {
-        System.out.println(userInfoService.findDepartLeader("84664"));
+        System.out.println(userInfoService.findDepartLeader("84666"));
     }
     }
 
 
     @Test
     @Test