From a33281f3cedc25240ed567ee6d49e3b2648f2fcc Mon Sep 17 00:00:00 2001
From: wangyanxiong <password>
Date: Tue, 13 Aug 2019 11:04:09 +0800
Subject: [PATCH] 修复编辑货主bug
---
.idea/workspace.xml | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
src/main/java/com/huaheng/pc/general/company/service/CompanyService.java | 2 +-
src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java | 4 ++--
src/main/java/com/huaheng/pc/system/user/controller/UserController.java | 2 +-
4 files changed, 108 insertions(+), 183 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index af33de9..b89b55f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,26 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/system/SysUserWarehouseMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<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/huaheng/pc/general/warehouse/domain/Warehouse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/domain/SysUserWarehouse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/SysUserWarehouse.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/mapper/SysUserWarehouseMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/SysUserWarehouseMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseService.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseServiceImpl.java" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/user/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/user/add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/user/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/user/edit.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -68,68 +52,12 @@
<select />
</component>
<component name="FileEditorManager">
- <leaf>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/shiro/web/filter/LogoutFilter.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="67" column="9" lean-forward="true" selection-start-line="42" selection-start-column="7" selection-end-line="67" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="226">
- <caret line="108" column="15" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="200">
- <caret line="500" column="12" lean-forward="true" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" />
- <folding>
- <element signature="e#17271#17272#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/tool/build/BuildController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="180" column="8" lean-forward="true" selection-start-line="180" selection-start-column="8" selection-end-line="180" selection-end-column="8" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#6920#6921#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="570">
- <caret line="102" column="44" selection-start-line="102" selection-start-column="22" selection-end-line="102" selection-end-column="44" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="35" column="12" lean-forward="true" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
- <folding>
- <element signature="e#853#854#0" expanded="true" />
- <element signature="e#889#890#0" expanded="true" />
- </folding>
+ <state relative-caret-position="152">
+ <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
</state>
</provider>
</entry>
@@ -179,6 +107,8 @@
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java" />
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java" />
</list>
</option>
</component>
@@ -210,7 +140,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -272,32 +202,7 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="general" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" 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="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="general" type="462c0819:PsiDirectoryNode" />
- <item name="warehouse" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" 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="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="general" type="462c0819:PsiDirectoryNode" />
- <item name="warehouse" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
+ <item name="tool" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -308,7 +213,8 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="system" type="462c0819:PsiDirectoryNode" />
+ <item name="tool" type="462c0819:PsiDirectoryNode" />
+ <item name="build" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -332,7 +238,7 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="system" type="462c0819:PsiDirectoryNode" />
+ <item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -341,14 +247,14 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="system" type="462c0819:PsiDirectoryNode" />
- <item name="user" type="462c0819:PsiDirectoryNode" />
+ <item name="admin" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
- <pane id="PackagesPane" />
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -362,7 +268,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565605136745" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565665283763" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
@@ -373,16 +279,16 @@
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.annotationProcessors" />
</component>
<component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="F:\wms2\src\main\resources\mybatis\system" />
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
+ <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.huaheng.pc.system.user.domain" />
<recent name="com.huaheng.pc.system.user.mapper" />
</key>
- <key name="MoveFile.RECENT_KEYS">
- <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
- <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="F:\wms2\src\main\resources\mybatis\system" />
</key>
</component>
<component name="RunDashboard">
@@ -464,6 +370,7 @@
<workItem from="1565328536669" duration="797000" />
<workItem from="1565571816154" duration="97000" />
<workItem from="1565571931294" duration="27171000" />
+ <workItem from="1565656592783" duration="4529000" />
</task>
<task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
<created>1565226427512</created>
@@ -486,17 +393,24 @@
<option name="project" value="LOCAL" />
<updated>1565259481656</updated>
</task>
- <option name="localTasksCounter" value="4" />
+ <task id="LOCAL-00004" summary="修改库区service">
+ <created>1565606342680</created>
+ <option name="number" value="00004" />
+ <option name="presentableId" value="LOCAL-00004" />
+ <option name="project" value="LOCAL" />
+ <updated>1565606342680</updated>
+ </task>
+ <option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="27268000" />
+ <option name="totallyTimeSpent" value="32428000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25670242" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2600536" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@@ -504,11 +418,10 @@
<window_info id="UI Designer" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info id="Web" order="7" side_tool="true" />
- <window_info anchor="bottom" id="Messages" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" weight="0.3753541" />
- <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.29745042" />
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3753541" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.29745042" />
<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" />
@@ -518,7 +431,8 @@
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.32719547" />
<window_info anchor="bottom" id="Java Enterprise" order="11" />
<window_info anchor="bottom" id="Database Changes" order="12" />
- <window_info anchor="bottom" id="Version Control" order="13" />
+ <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.49932975" weight="0.3286119" />
+ <window_info anchor="bottom" id="Messages" order="14" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -546,7 +460,14 @@
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
- <option name="COLUMN_ORDER" />
+ <option name="COLUMN_ORDER">
+ <list>
+ <option value="0" />
+ <option value="1" />
+ <option value="2" />
+ <option value="3" />
+ </list>
+ </option>
</State>
</value>
</entry>
@@ -586,13 +507,6 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/RoleMapper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="76">
- <caret line="19" selection-start-line="19" selection-end-line="21" selection-end-column="10" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/mapper/RoleMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
@@ -600,20 +514,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="54" column="39" selection-start-line="54" selection-start-column="32" selection-end-line="54" selection-end-column="39" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="107">
- <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/domain/Role.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
@@ -756,13 +656,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/tool/build/BuildController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="149">
- <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/notice/controller/NoticeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1034">
@@ -909,27 +802,55 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/shiro/web/filter/LogoutFilter.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="67" column="9" lean-forward="true" selection-start-line="42" selection-start-column="7" selection-end-line="67" selection-end-column="9" />
+ <state relative-caret-position="247">
+ <caret line="203" column="33" lean-forward="true" selection-start-line="203" selection-start-column="33" selection-end-line="203" selection-end-column="33" />
+ <folding>
+ <element signature="e#1625#1626#0" expanded="true" />
+ <element signature="e#1652#1653#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerCapacity/controller/ContainerCapacityController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="226">
- <caret line="108" column="15" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" />
+ <state relative-caret-position="1688">
+ <caret line="133" column="46" selection-start-line="133" selection-start-column="22" selection-end-line="133" selection-end-column="46" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="247">
- <caret line="203" column="33" lean-forward="true" selection-start-line="203" selection-start-column="33" selection-end-line="203" selection-end-column="33" />
+ <state relative-caret-position="-109">
+ <caret line="51" column="13" lean-forward="true" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="130">
+ <caret line="13" column="25" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="144">
+ <caret line="106" column="39" selection-start-line="106" selection-start-column="31" selection-end-line="106" selection-end-column="39" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="130">
+ <caret line="156" column="62" lean-forward="true" selection-start-line="156" selection-start-column="62" selection-end-line="156" selection-end-column="62" />
<folding>
- <element signature="e#1625#1626#0" expanded="true" />
- <element signature="e#1652#1653#0" expanded="true" />
+ <element signature="imports" expanded="true" />
+ <element signature="e#2840#2841#0" expanded="true" />
+ <element signature="e#2879#2880#0" expanded="true" />
+ <element signature="e#6841#6842#0" expanded="true" />
+ <element signature="e#6902#6903#0" expanded="true" />
</folding>
</state>
</provider>
@@ -937,7 +858,7 @@
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
- <caret line="35" column="12" lean-forward="true" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
+ <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
<folding>
<element signature="e#853#854#0" expanded="true" />
<element signature="e#889#890#0" expanded="true" />
@@ -945,31 +866,35 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="570">
- <caret line="102" column="44" selection-start-line="102" selection-start-column="22" selection-end-line="102" selection-end-column="44" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
- <caret line="500" column="12" lean-forward="true" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" />
+ <caret line="500" column="12" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" />
<folding>
+ <element signature="e#17203#17204#0" expanded="true" />
<element signature="e#17271#17272#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="180" column="8" lean-forward="true" selection-start-line="180" selection-start-column="8" selection-end-line="180" selection-end-column="8" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#6920#6921#0" expanded="true" />
- </folding>
+ <state relative-caret-position="226">
+ <caret line="108" column="15" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/shiro/web/filter/LogoutFilter.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="171">
+ <caret line="56" column="33" lean-forward="true" selection-start-line="56" selection-start-column="33" selection-end-line="56" selection-end-column="33" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/tool/build/BuildController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="152">
+ <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
</state>
</provider>
</entry>
diff --git a/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java b/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java
index b169ff6..4af1fd0 100644
--- a/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java
+++ b/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java
@@ -11,7 +11,7 @@ public interface CompanyService extends IService<Company>{
public List<Company> selectCompanyByCurrentUserId();
- public List<Company> selectCompanyByUserId();
+ public List<Company> selectCompanyByUserId(Integer id);
public AjaxResult addCompany(Company company);
diff --git a/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java b/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
index c5f398d..e61447d 100644
--- a/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
@@ -39,9 +39,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
* @return
*/
@Override
- public List<Company> selectCompanyByUserId() {
+ public List<Company> selectCompanyByUserId(Integer id) {
UserCompany condition = new UserCompany();
- condition.setUserId(ShiroUtils.getUserId());
+ condition.setUserId(id);
List<UserCompany> userCompanys = userCompanyMapper.selectListEntityByEqual(condition);
Company company = new Company();
company.setWarehouseCode(ShiroUtils.getWarehouseCode());
diff --git a/src/main/java/com/huaheng/pc/system/user/controller/UserController.java b/src/main/java/com/huaheng/pc/system/user/controller/UserController.java
index 8aa4411..43c125d 100644
--- a/src/main/java/com/huaheng/pc/system/user/controller/UserController.java
+++ b/src/main/java/com/huaheng/pc/system/user/controller/UserController.java
@@ -154,7 +154,7 @@ public class UserController extends BaseController
{
mmap.put("user", userService.selectUserById(id));
mmap.put("roles", roleService.selectRolesByUserId(id));
- mmap.put("companys", companyService.selectCompanyByUserId());
+ mmap.put("companys", companyService.selectCompanyByUserId(id));
mmap.put("warehouses", warehouseService.selectWarehouseByUserId(id));
return prefix + "/edit";
}
--
libgit2 0.22.2