Skip to content

S
sunac_report
Commit 57181876 by sunxin
Options

人员管理修改区域二级显示

parent 855bc277
Showing with 217 additions and 166 deletions
.idea/workspace.xml
......@@ -8,21 +8,16 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="测试git">
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="基本完善">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/META-INF/MANIFEST.MF" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/org/apache/ibatis/thread/MybatisRunnable.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/org/mybatis/spring/SqlSessionFactoryBean.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/assets/ckfinder/skins/v1/images/ckfnothumb.gif" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/assets/jquery-ztree/3.5.12/api/cn/setting.async.autoParam.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac.war" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/report/web/ReportController.class" afterDir="false" />
</list>
<ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -75,40 +70,10 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="515" column="30" selection-start-line="515" selection-start-column="30" selection-end-line="515" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="422" column="8" lean-forward="true" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="1065" column="36" lean-forward="true" selection-start-line="1065" selection-start-column="36" selection-end-line="1065" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="417" column="55" lean-forward="true" selection-start-line="417" selection-start-column="55" selection-end-line="417" selection-end-column="55" />
<state relative-caret-position="157">
<caret line="140" column="26" lean-forward="true" selection-start-line="140" selection-start-column="26" selection-end-line="140" selection-end-column="26" />
</state>
</provider>
</entry>
......@@ -125,10 +90,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>selectDone</find>
<find>selectType</find>
<find>ctx</find>
<find>form</find>
<find>addT</find>
<find>集合</find>
<find>getBusCategory</find>
......@@ -154,7 +115,11 @@
<find>reportDao</find>
<find>transferDepartmentid</find>
<find>transferDepartment</find>
<find>area</find>
<find>userIndex</find>
<find>userColumns</find>
<find>list</find>
<find>find</find>
</findStrings>
<replaceStrings>
<replace>${db.table.prefix}</replace>
......@@ -181,7 +146,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToWordController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/front/report/service/FrontReportService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/filter/CORSFilter.java" />
......@@ -216,10 +180,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/CtBbtcBusCategory.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryList.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/report/CtBbtcBusCategoryDao.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/Page.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcBusCategoryForm.jsp" />
......@@ -232,6 +193,10 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp" />
</list>
</option>
</component>
......@@ -452,7 +417,7 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="sys" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
......@@ -463,7 +428,19 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
<item name="sys" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="sys" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path>
<path>
......@@ -471,6 +448,30 @@
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mappings" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="mappings" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
......@@ -511,6 +512,17 @@
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="sys" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -552,12 +564,9 @@
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\sunac_report\target\report_sunac\WEB-INF\lib" />
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\lib" />
<recent name="D:\ideaProjects\sunac_report\src\main\webapp\WEB-INF\lib" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\common" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\resources" />
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\views\modules\report" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.ejweb.conf" />
......@@ -565,9 +574,12 @@
<recent name="com.ejweb.core.filter" />
<recent name="com.ejweb.core.base" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\views\modules\report" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" />
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\sunac_report\target\report_sunac\WEB-INF\lib" />
<recent name="D:\sunac_report\src\main\webapp\WEB-INF\lib" />
<recent name="D:\ideaProjects\sunac_report\src\main\webapp\WEB-INF\lib" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\common" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\resources" />
</key>
</component>
<component name="RunAnythingCache">
......@@ -1296,14 +1308,7 @@
<workItem from="1563930477196" duration="23466000" />
<workItem from="1564017393575" duration="26783000" />
<workItem from="1564103732268" duration="2278000" />
<workItem from="1564112769708" duration="2788000" />
</task>
<task id="LOCAL-00070" summary="解决时间">
<created>1499153545588</created>
<option name="number" value="00070" />
<option name="presentableId" value="LOCAL-00070" />
<option name="project" value="LOCAL" />
<updated>1499153545588</updated>
<workItem from="1564112769708" duration="7978000" />
</task>
<task id="LOCAL-00071" summary="去掉链接长度限制">
<created>1499222787162</created>
......@@ -1641,11 +1646,18 @@
<option name="project" value="LOCAL" />
<updated>1564020224757</updated>
</task>
<option name="localTasksCounter" value="119" />
<task id="LOCAL-00119" summary="基本完善">
<created>1564117353418</created>
<option name="number" value="00119" />
<option name="presentableId" value="LOCAL-00119" />
<option name="project" value="LOCAL" />
<updated>1564117353419</updated>
</task>
<option name="localTasksCounter" value="120" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1201597000" />
<option name="totallyTimeSpent" value="1206787000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -1660,7 +1672,7 @@
<frame x="-8" y="-8" width="1552" height="840" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.32083055" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.32083055" />
<window_info id="Structure" order="1" weight="0.25" />
<window_info id="Nl-Palette" order="2" />
<window_info id="Designer" order="3" />
......@@ -1671,15 +1683,15 @@
<window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32894737" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.04385965" />
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.2631579" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.078947365" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.3295711" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32894737" />
<window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5003349" side_tool="true" weight="0.4868421" />
<window_info anchor="bottom" id="Messages" order="8" weight="0.20175439" />
<window_info anchor="bottom" id="Java Enterprise" order="9" />
<window_info anchor="bottom" id="Version Control" order="10" />
<window_info anchor="bottom" id="Version Control" order="10" sideWeight="0.4996651" weight="0.14327486" />
<window_info anchor="bottom" id="Spring" order="11" />
<window_info anchor="bottom" id="Terminal" order="12" weight="0.3295711" />
<window_info anchor="bottom" id="Application Servers" order="13" />
......@@ -1797,7 +1809,6 @@
<path value="$PROJECT_DIR$/../xinao-officeassets-core" />
<path value="$PROJECT_DIR$/../git/Git/repository" />
</ignored-roots>
<MESSAGE value="修改用户权限" />
<MESSAGE value="注释掉oa用户编辑" />
<MESSAGE value="屏蔽掉OA用户" />
<MESSAGE value="屏蔽oa用户的备注" />
......@@ -1822,7 +1833,8 @@
<MESSAGE value=" 修改数据" />
<MESSAGE value="需求更新" />
<MESSAGE value="测试git" />
<option name="LAST_COMMIT_MESSAGE" value="测试git" />
<MESSAGE value="基本完善" />
<option name="LAST_COMMIT_MESSAGE" value="基本完善" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1977,48 +1989,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="47" column="35" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="308" column="13" lean-forward="true" selection-start-line="308" selection-start-column="13" selection-end-line="308" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="74" column="47" lean-forward="true" selection-start-line="74" selection-start-column="47" selection-end-line="74" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="140" column="26" lean-forward="true" selection-start-line="140" selection-start-column="26" selection-end-line="140" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="223" column="64" lean-forward="true" selection-start-line="223" selection-start-column="64" selection-end-line="223" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/SysUserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="108" column="60" lean-forward="true" selection-start-line="108" selection-start-column="60" selection-end-line="108" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/ctBbtcRegionList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="121">
......@@ -2165,13 +2135,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="36" column="23" lean-forward="true" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
......@@ -2236,13 +2199,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11286">
<caret line="594" column="57" selection-start-line="594" selection-start-column="50" selection-end-line="594" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
......@@ -2283,10 +2239,41 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="1065" column="36" selection-start-line="1065" selection-start-column="36" selection-end-line="1065" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="417" column="55" selection-start-line="417" selection-start-column="55" selection-end-line="417" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-94">
<caret line="422" column="8" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="480" column="25" lean-forward="true" selection-start-line="480" selection-start-column="25" selection-end-line="480" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3496">
<caret line="184" column="33" selection-start-line="184" selection-start-column="28" selection-end-line="184" selection-end-column="33" />
<state relative-caret-position="362">
<caret line="67" column="36" lean-forward="true" selection-start-line="66" selection-start-column="7" selection-end-line="67" selection-end-column="36" />
<folding>
<marker date="1564046295646" expanded="true" signature="2405:2981" ph="SELECT ,su.n... " />
<marker date="1564046295646" expanded="true" signature="3087:8864" ph="SELECT ,su.n... " />
......@@ -2328,34 +2315,65 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="1065" column="36" lean-forward="true" selection-start-line="1065" selection-start-column="36" selection-end-line="1065" selection-end-column="36" />
<state relative-caret-position="265">
<caret line="90" column="33" selection-start-line="90" selection-start-column="33" selection-end-line="90" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/persistence/CrudDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="422" column="8" lean-forward="true" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="8" />
<state relative-caret-position="159">
<caret line="36" column="23" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/entity/User.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="417" column="55" lean-forward="true" selection-start-line="417" selection-start-column="55" selection-end-line="417" selection-end-column="55" />
<state relative-caret-position="333">
<caret line="47" column="35" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="35" />
<folding>
<element signature="e#1914#1915#0" expanded="true" />
<element signature="e#1945#1946#0" expanded="true" />
<element signature="e#1993#1994#0" expanded="true" />
<element signature="e#2033#2034#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="515" column="30" selection-start-line="515" selection-start-column="30" selection-end-line="515" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="103">
<caret line="77" column="16" lean-forward="true" selection-start-line="77" selection-start-column="16" selection-end-line="77" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="522" column="41" lean-forward="true" selection-start-line="515" selection-start-column="34" selection-end-line="522" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/SysUserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="64" column="43" lean-forward="true" selection-start-line="64" selection-start-column="43" selection-end-line="64" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="94">
<caret line="71" column="37" lean-forward="true" selection-start-line="71" selection-start-column="37" selection-end-line="71" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="140" column="26" lean-forward="true" selection-start-line="140" selection-start-column="26" selection-end-line="140" selection-end-column="26" />
</state>
</provider>
</entry>
......
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -518,22 +518,22 @@ public class ReportController extends BaseController {
}*/
/*封装拼接移交集团信息*/
String transferGroup = reportEntity.getTransferGroup();
String transferGroup = reportEntity1.getTransferGroup();
if(StringUtils.isNoneBlank(transferGroup)){
if("3437402691677202102".equals(transferGroup)){
reportEntity.setTransferGroup("集团本部");
reportEntity1.setTransferGroup("集团本部");
}else if("3510129313047280678".equals(transferGroup)){
reportEntity.setTransferGroup("区域集团");
reportEntity1.setTransferGroup("区域集团");
}else if("3565898923067676254".equals(transferGroup)){
reportEntity.setTransferGroup("服务集团");
reportEntity1.setTransferGroup("服务集团");
}else if("3806696792996264972".equals(transferGroup)){
reportEntity.setTransferGroup("文化集团");
reportEntity1.setTransferGroup("文化集团");
}else if("3770618512934949260".equals(transferGroup)){
reportEntity.setTransferGroup("文旅集团");
reportEntity1.setTransferGroup("文旅集团");
}
}else{
reportEntity.setTransferGroup("--");
reportEntity1.setTransferGroup("--");
}
if (isAdmin.equals("1") || isAdmin.equals("2")) {
......
src/main/java/com/ejweb/modules/sys/entity/User.java
......@@ -52,6 +52,16 @@ public class User extends DataEntity<User> {
private String roleId;
private Role role; // 根据角色查询用户条件
private String areaName; //用户所属区域组织名字
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
private List<Role> roleList = Lists.newArrayList(); // 拥有角色列表
public String getSupplementGroup() {
......
src/main/resources/mappings/modules/sys/UserDao.xml
......@@ -81,6 +81,7 @@
a.update_by AS "updateBy.id",
a.update_date,
a.del_flag,
a.supplement_group AS supplementGroup,
c.name AS "company.name",
c.parent_id AS "company.parent.id",
c.parent_ids AS "company.parentIds",
......@@ -102,7 +103,10 @@
ou.id AS "office.primaryPerson.id",
ou.name AS "office.primaryPerson.name",
ou2.id AS "office.deputyPerson.id",
ou2.name AS "office.deputyPerson.name"<!-- ,
ou2.name AS "office.deputyPerson.name"
<!-- ,
r.id AS "roleList.id",
r.office_id AS "roleList.office.id",
r.name AS "roleList.name",
......@@ -119,9 +123,13 @@
LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person
LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person
LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person
LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person<!--
LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person
<!--
LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id -->
LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id
-->
</sql>
<!-- 根据编号获得用户 -->
......@@ -148,9 +156,12 @@
<select id="findList" resultType="User">
SELECT
role.id AS roleId,
cr.name AS areaName,
<include refid="userColumns"/>
FROM ct_bbtc_sys_user a
<include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
<if test="role != null and role.id != null and role.id != ''">
JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id}
</if>
......@@ -210,9 +221,12 @@
<!-- 查询全部用户 -->
<select id="findAllList" resultType="User">
SELECT
cr.name AS areaName,
<include refid="userColumns"/>
FROM ct_bbtc_sys_user a
<include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY c.code, o.code, a.name
</select>
......
src/main/webapp/WEB-INF/views/modules/sys/userForm.jsp
......@@ -147,7 +147,7 @@
<label class="control-label">所属区域:</label>
<div class="controls">
<form:select id="supplementArea" path="area" class="input-small required">
<form:option value=" "></form:option>
<form:option value="">请选择</form:option>
<%-- <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/>--%>
</form:select>
......
src/main/webapp/WEB-INF/views/modules/sys/userList.jsp
......@@ -62,7 +62,7 @@
</form:form>
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead><tr><%--<th>归属公司</th><th>归属部门</th>--%><th class="sort-column login_name">登录名</th><th class="sort-column name">姓名</th><th>电话</th><th>手机</th><%--<th>角色</th> --%><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<thead><tr><%--<th>归属公司</th><th>归属部门</th>--%><th class="sort-column login_name">登录名</th><th class="sort-column name">姓名</th><th>所属集团</th><th>所属区域</th><th>电话</th><th>手机</th><%--<th>角色</th> --%><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody>
<c:forEach items="${page.list}" var="user">
<tr>
......@@ -70,6 +70,15 @@
<td>${user.office.name}</td>--%>
<td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginName}</a></td>
<td>${user.name}</td>
<td align="center">
<c:if test="${user.supplementGroup eq '3437402691677202102'}">集团本部</c:if>
<c:if test="${user.supplementGroup eq '3510129313047280678'}">区域集团</c:if>
<c:if test="${user.supplementGroup eq '3565898923067676254'}">服务集团</c:if>
<c:if test="${user.supplementGroup eq '3806696792996264972'}">文化集团</c:if>
<c:if test="${user.supplementGroup eq '3770618512934949260'}">文旅集团</c:if>
<c:if test="${user.supplementGroup eq null}">--</c:if>
</td>
<td>${user.areaName}</td>
<td>${user.phone}</td>
<td>${user.mobile}</td><%--
<td>${user.roleNames}</td> --%>
......
target/report_sunac.war
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment