Commit a33281f3cedc25240ed567ee6d49e3b2648f2fcc
1 parent
80be6249
修复编辑货主bug
Showing
4 changed files
with
108 additions
and
183 deletions
.idea/workspace.xml
| ... | ... | @@ -2,26 +2,10 @@ |
| 2 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | 4 | <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment=""> |
| 5 | - <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/system/SysUserWarehouseMapper.xml" afterDir="false" /> | |
| 6 | - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> | |
| 7 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 8 | - <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" /> | |
| 9 | - <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" /> | |
| 10 | - <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" /> | |
| 11 | - <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" /> | |
| 6 | + <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" /> | |
| 7 | + <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" /> | |
| 12 | 8 | <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" /> |
| 13 | - <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" /> | |
| 14 | - <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" /> | |
| 15 | - <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" /> | |
| 16 | - <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" /> | |
| 17 | - <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" /> | |
| 18 | - <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" /> | |
| 19 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseService.java" beforeDir="false" /> | |
| 20 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/userWarehouse/service/SysUserWarehouseServiceImpl.java" beforeDir="false" /> | |
| 21 | - <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" /> | |
| 22 | - <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" /> | |
| 23 | - <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" /> | |
| 24 | - <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" /> | |
| 25 | 9 | </list> |
| 26 | 10 | <ignored path="$PROJECT_DIR$/target/" /> |
| 27 | 11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| ... | ... | @@ -68,68 +52,12 @@ |
| 68 | 52 | <select /> |
| 69 | 53 | </component> |
| 70 | 54 | <component name="FileEditorManager"> |
| 71 | - <leaf> | |
| 72 | - <file pinned="false" current-in-tab="false"> | |
| 73 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/shiro/web/filter/LogoutFilter.java"> | |
| 74 | - <provider selected="true" editor-type-id="text-editor"> | |
| 75 | - <state relative-caret-position="266"> | |
| 76 | - <caret line="67" column="9" lean-forward="true" selection-start-line="42" selection-start-column="7" selection-end-line="67" selection-end-column="9" /> | |
| 77 | - </state> | |
| 78 | - </provider> | |
| 79 | - </entry> | |
| 80 | - </file> | |
| 81 | - <file pinned="false" current-in-tab="false"> | |
| 82 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java"> | |
| 83 | - <provider selected="true" editor-type-id="text-editor"> | |
| 84 | - <state relative-caret-position="226"> | |
| 85 | - <caret line="108" column="15" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" /> | |
| 86 | - </state> | |
| 87 | - </provider> | |
| 88 | - </entry> | |
| 89 | - </file> | |
| 90 | - <file pinned="false" current-in-tab="false"> | |
| 91 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java"> | |
| 92 | - <provider selected="true" editor-type-id="text-editor"> | |
| 93 | - <state relative-caret-position="200"> | |
| 94 | - <caret line="500" column="12" lean-forward="true" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" /> | |
| 95 | - <folding> | |
| 96 | - <element signature="e#17271#17272#0" expanded="true" /> | |
| 97 | - </folding> | |
| 98 | - </state> | |
| 99 | - </provider> | |
| 100 | - </entry> | |
| 101 | - </file> | |
| 55 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
| 102 | 56 | <file pinned="false" current-in-tab="true"> |
| 103 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java"> | |
| 57 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/tool/build/BuildController.java"> | |
| 104 | 58 | <provider selected="true" editor-type-id="text-editor"> |
| 105 | - <state relative-caret-position="266"> | |
| 106 | - <caret line="180" column="8" lean-forward="true" selection-start-line="180" selection-start-column="8" selection-end-line="180" selection-end-column="8" /> | |
| 107 | - <folding> | |
| 108 | - <element signature="imports" expanded="true" /> | |
| 109 | - <element signature="e#6920#6921#0" expanded="true" /> | |
| 110 | - </folding> | |
| 111 | - </state> | |
| 112 | - </provider> | |
| 113 | - </entry> | |
| 114 | - </file> | |
| 115 | - <file pinned="false" current-in-tab="false"> | |
| 116 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html"> | |
| 117 | - <provider selected="true" editor-type-id="text-editor"> | |
| 118 | - <state relative-caret-position="570"> | |
| 119 | - <caret line="102" column="44" selection-start-line="102" selection-start-column="22" selection-end-line="102" selection-end-column="44" /> | |
| 120 | - </state> | |
| 121 | - </provider> | |
| 122 | - </entry> | |
| 123 | - </file> | |
| 124 | - <file pinned="false" current-in-tab="false"> | |
| 125 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java"> | |
| 126 | - <provider selected="true" editor-type-id="text-editor"> | |
| 127 | - <state relative-caret-position="195"> | |
| 128 | - <caret line="35" column="12" lean-forward="true" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" /> | |
| 129 | - <folding> | |
| 130 | - <element signature="e#853#854#0" expanded="true" /> | |
| 131 | - <element signature="e#889#890#0" expanded="true" /> | |
| 132 | - </folding> | |
| 59 | + <state relative-caret-position="152"> | |
| 60 | + <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" /> | |
| 133 | 61 | </state> |
| 134 | 62 | </provider> |
| 135 | 63 | </entry> |
| ... | ... | @@ -179,6 +107,8 @@ |
| 179 | 107 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java" /> |
| 180 | 108 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java" /> |
| 181 | 109 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java" /> |
| 110 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java" /> | |
| 111 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java" /> | |
| 182 | 112 | </list> |
| 183 | 113 | </option> |
| 184 | 114 | </component> |
| ... | ... | @@ -210,7 +140,7 @@ |
| 210 | 140 | <foldersAlwaysOnTop value="true" /> |
| 211 | 141 | </navigator> |
| 212 | 142 | <panes> |
| 213 | - <pane id="Scope" /> | |
| 143 | + <pane id="PackagesPane" /> | |
| 214 | 144 | <pane id="ProjectPane"> |
| 215 | 145 | <subPane> |
| 216 | 146 | <expand> |
| ... | ... | @@ -272,32 +202,7 @@ |
| 272 | 202 | <item name="com" type="462c0819:PsiDirectoryNode" /> |
| 273 | 203 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 274 | 204 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 275 | - <item name="general" type="462c0819:PsiDirectoryNode" /> | |
| 276 | - </path> | |
| 277 | - <path> | |
| 278 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 279 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 280 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 281 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 282 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 283 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 284 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 285 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 286 | - <item name="general" type="462c0819:PsiDirectoryNode" /> | |
| 287 | - <item name="warehouse" type="462c0819:PsiDirectoryNode" /> | |
| 288 | - </path> | |
| 289 | - <path> | |
| 290 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 291 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 292 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 293 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 294 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 295 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 296 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 297 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 298 | - <item name="general" type="462c0819:PsiDirectoryNode" /> | |
| 299 | - <item name="warehouse" type="462c0819:PsiDirectoryNode" /> | |
| 300 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
| 205 | + <item name="tool" type="462c0819:PsiDirectoryNode" /> | |
| 301 | 206 | </path> |
| 302 | 207 | <path> |
| 303 | 208 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -308,7 +213,8 @@ |
| 308 | 213 | <item name="com" type="462c0819:PsiDirectoryNode" /> |
| 309 | 214 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 310 | 215 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 311 | - <item name="system" type="462c0819:PsiDirectoryNode" /> | |
| 216 | + <item name="tool" type="462c0819:PsiDirectoryNode" /> | |
| 217 | + <item name="build" type="462c0819:PsiDirectoryNode" /> | |
| 312 | 218 | </path> |
| 313 | 219 | <path> |
| 314 | 220 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -332,7 +238,7 @@ |
| 332 | 238 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 333 | 239 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 334 | 240 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 335 | - <item name="system" type="462c0819:PsiDirectoryNode" /> | |
| 241 | + <item name="admin" type="462c0819:PsiDirectoryNode" /> | |
| 336 | 242 | </path> |
| 337 | 243 | <path> |
| 338 | 244 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -341,14 +247,14 @@ |
| 341 | 247 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 342 | 248 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 343 | 249 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 344 | - <item name="system" type="462c0819:PsiDirectoryNode" /> | |
| 345 | - <item name="user" type="462c0819:PsiDirectoryNode" /> | |
| 250 | + <item name="admin" type="462c0819:PsiDirectoryNode" /> | |
| 251 | + <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 346 | 252 | </path> |
| 347 | 253 | </expand> |
| 348 | 254 | <select /> |
| 349 | 255 | </subPane> |
| 350 | 256 | </pane> |
| 351 | - <pane id="PackagesPane" /> | |
| 257 | + <pane id="Scope" /> | |
| 352 | 258 | </panes> |
| 353 | 259 | </component> |
| 354 | 260 | <component name="PropertiesComponent"> |
| ... | ... | @@ -362,7 +268,7 @@ |
| 362 | 268 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
| 363 | 269 | <property name="WebServerToolWindowFactoryState" value="false" /> |
| 364 | 270 | <property name="aspect.path.notification.shown" value="true" /> |
| 365 | - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565605136745" /> | |
| 271 | + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565665283763" /> | |
| 366 | 272 | <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" /> |
| 367 | 273 | <property name="node.js.detected.package.eslint" value="true" /> |
| 368 | 274 | <property name="node.js.detected.package.tslint" value="true" /> |
| ... | ... | @@ -373,16 +279,16 @@ |
| 373 | 279 | <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.annotationProcessors" /> |
| 374 | 280 | </component> |
| 375 | 281 | <component name="RecentsManager"> |
| 376 | - <key name="CopyFile.RECENT_KEYS"> | |
| 377 | - <recent name="F:\wms2\src\main\resources\mybatis\system" /> | |
| 282 | + <key name="MoveFile.RECENT_KEYS"> | |
| 283 | + <recent name="E:\code\wms2\src\main\resources\mybatis\general" /> | |
| 284 | + <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> | |
| 378 | 285 | </key> |
| 379 | 286 | <key name="CopyClassDialog.RECENTS_KEY"> |
| 380 | 287 | <recent name="com.huaheng.pc.system.user.domain" /> |
| 381 | 288 | <recent name="com.huaheng.pc.system.user.mapper" /> |
| 382 | 289 | </key> |
| 383 | - <key name="MoveFile.RECENT_KEYS"> | |
| 384 | - <recent name="E:\code\wms2\src\main\resources\mybatis\general" /> | |
| 385 | - <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> | |
| 290 | + <key name="CopyFile.RECENT_KEYS"> | |
| 291 | + <recent name="F:\wms2\src\main\resources\mybatis\system" /> | |
| 386 | 292 | </key> |
| 387 | 293 | </component> |
| 388 | 294 | <component name="RunDashboard"> |
| ... | ... | @@ -464,6 +370,7 @@ |
| 464 | 370 | <workItem from="1565328536669" duration="797000" /> |
| 465 | 371 | <workItem from="1565571816154" duration="97000" /> |
| 466 | 372 | <workItem from="1565571931294" duration="27171000" /> |
| 373 | + <workItem from="1565656592783" duration="4529000" /> | |
| 467 | 374 | </task> |
| 468 | 375 | <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> |
| 469 | 376 | <created>1565226427512</created> |
| ... | ... | @@ -486,17 +393,24 @@ |
| 486 | 393 | <option name="project" value="LOCAL" /> |
| 487 | 394 | <updated>1565259481656</updated> |
| 488 | 395 | </task> |
| 489 | - <option name="localTasksCounter" value="4" /> | |
| 396 | + <task id="LOCAL-00004" summary="修改库区service"> | |
| 397 | + <created>1565606342680</created> | |
| 398 | + <option name="number" value="00004" /> | |
| 399 | + <option name="presentableId" value="LOCAL-00004" /> | |
| 400 | + <option name="project" value="LOCAL" /> | |
| 401 | + <updated>1565606342680</updated> | |
| 402 | + </task> | |
| 403 | + <option name="localTasksCounter" value="5" /> | |
| 490 | 404 | <servers /> |
| 491 | 405 | </component> |
| 492 | 406 | <component name="TimeTrackingManager"> |
| 493 | - <option name="totallyTimeSpent" value="27268000" /> | |
| 407 | + <option name="totallyTimeSpent" value="32428000" /> | |
| 494 | 408 | </component> |
| 495 | 409 | <component name="ToolWindowManager"> |
| 496 | 410 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
| 497 | 411 | <editor active="true" /> |
| 498 | 412 | <layout> |
| 499 | - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25670242" /> | |
| 413 | + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2600536" /> | |
| 500 | 414 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 501 | 415 | <window_info id="Designer" order="2" /> |
| 502 | 416 | <window_info id="Image Layers" order="3" /> |
| ... | ... | @@ -504,11 +418,10 @@ |
| 504 | 418 | <window_info id="UI Designer" order="5" /> |
| 505 | 419 | <window_info id="Favorites" order="6" side_tool="true" /> |
| 506 | 420 | <window_info id="Web" order="7" side_tool="true" /> |
| 507 | - <window_info anchor="bottom" id="Messages" /> | |
| 508 | 421 | <window_info anchor="bottom" id="Message" order="0" /> |
| 509 | 422 | <window_info anchor="bottom" id="Find" order="1" /> |
| 510 | - <window_info anchor="bottom" id="Run" order="2" weight="0.3753541" /> | |
| 511 | - <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.29745042" /> | |
| 423 | + <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3753541" /> | |
| 424 | + <window_info anchor="bottom" id="Debug" order="3" weight="0.29745042" /> | |
| 512 | 425 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| 513 | 426 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| 514 | 427 | <window_info anchor="bottom" id="TODO" order="6" /> |
| ... | ... | @@ -518,7 +431,8 @@ |
| 518 | 431 | <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.32719547" /> |
| 519 | 432 | <window_info anchor="bottom" id="Java Enterprise" order="11" /> |
| 520 | 433 | <window_info anchor="bottom" id="Database Changes" order="12" /> |
| 521 | - <window_info anchor="bottom" id="Version Control" order="13" /> | |
| 434 | + <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.49932975" weight="0.3286119" /> | |
| 435 | + <window_info anchor="bottom" id="Messages" order="14" /> | |
| 522 | 436 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| 523 | 437 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
| 524 | 438 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
| ... | ... | @@ -546,7 +460,14 @@ |
| 546 | 460 | <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> |
| 547 | 461 | <collection /> |
| 548 | 462 | </option> |
| 549 | - <option name="COLUMN_ORDER" /> | |
| 463 | + <option name="COLUMN_ORDER"> | |
| 464 | + <list> | |
| 465 | + <option value="0" /> | |
| 466 | + <option value="1" /> | |
| 467 | + <option value="2" /> | |
| 468 | + <option value="3" /> | |
| 469 | + </list> | |
| 470 | + </option> | |
| 550 | 471 | </State> |
| 551 | 472 | </value> |
| 552 | 473 | </entry> |
| ... | ... | @@ -586,13 +507,6 @@ |
| 586 | 507 | </breakpoint-manager> |
| 587 | 508 | </component> |
| 588 | 509 | <component name="editorHistoryManager"> |
| 589 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/RoleMapper.xml"> | |
| 590 | - <provider selected="true" editor-type-id="text-editor"> | |
| 591 | - <state relative-caret-position="76"> | |
| 592 | - <caret line="19" selection-start-line="19" selection-end-line="21" selection-end-column="10" /> | |
| 593 | - </state> | |
| 594 | - </provider> | |
| 595 | - </entry> | |
| 596 | 510 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/mapper/RoleMapper.java"> |
| 597 | 511 | <provider selected="true" editor-type-id="text-editor"> |
| 598 | 512 | <state relative-caret-position="126"> |
| ... | ... | @@ -600,20 +514,6 @@ |
| 600 | 514 | </state> |
| 601 | 515 | </provider> |
| 602 | 516 | </entry> |
| 603 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java"> | |
| 604 | - <provider selected="true" editor-type-id="text-editor"> | |
| 605 | - <state relative-caret-position="240"> | |
| 606 | - <caret line="54" column="39" selection-start-line="54" selection-start-column="32" selection-end-line="54" selection-end-column="39" /> | |
| 607 | - </state> | |
| 608 | - </provider> | |
| 609 | - </entry> | |
| 610 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java"> | |
| 611 | - <provider selected="true" editor-type-id="text-editor"> | |
| 612 | - <state relative-caret-position="107"> | |
| 613 | - <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" /> | |
| 614 | - </state> | |
| 615 | - </provider> | |
| 616 | - </entry> | |
| 617 | 517 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/domain/Role.java"> |
| 618 | 518 | <provider selected="true" editor-type-id="text-editor"> |
| 619 | 519 | <state relative-caret-position="133"> |
| ... | ... | @@ -756,13 +656,6 @@ |
| 756 | 656 | </state> |
| 757 | 657 | </provider> |
| 758 | 658 | </entry> |
| 759 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/tool/build/BuildController.java"> | |
| 760 | - <provider selected="true" editor-type-id="text-editor"> | |
| 761 | - <state relative-caret-position="149"> | |
| 762 | - <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> | |
| 763 | - </state> | |
| 764 | - </provider> | |
| 765 | - </entry> | |
| 766 | 659 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/notice/controller/NoticeController.java"> |
| 767 | 660 | <provider selected="true" editor-type-id="text-editor"> |
| 768 | 661 | <state relative-caret-position="-1034"> |
| ... | ... | @@ -909,27 +802,55 @@ |
| 909 | 802 | </state> |
| 910 | 803 | </provider> |
| 911 | 804 | </entry> |
| 912 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/shiro/web/filter/LogoutFilter.java"> | |
| 805 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java"> | |
| 913 | 806 | <provider selected="true" editor-type-id="text-editor"> |
| 914 | - <state relative-caret-position="266"> | |
| 915 | - <caret line="67" column="9" lean-forward="true" selection-start-line="42" selection-start-column="7" selection-end-line="67" selection-end-column="9" /> | |
| 807 | + <state relative-caret-position="247"> | |
| 808 | + <caret line="203" column="33" lean-forward="true" selection-start-line="203" selection-start-column="33" selection-end-line="203" selection-end-column="33" /> | |
| 809 | + <folding> | |
| 810 | + <element signature="e#1625#1626#0" expanded="true" /> | |
| 811 | + <element signature="e#1652#1653#0" expanded="true" /> | |
| 812 | + </folding> | |
| 916 | 813 | </state> |
| 917 | 814 | </provider> |
| 918 | 815 | </entry> |
| 919 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java"> | |
| 816 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerCapacity/controller/ContainerCapacityController.java"> | |
| 920 | 817 | <provider selected="true" editor-type-id="text-editor"> |
| 921 | - <state relative-caret-position="226"> | |
| 922 | - <caret line="108" column="15" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" /> | |
| 818 | + <state relative-caret-position="1688"> | |
| 819 | + <caret line="133" column="46" selection-start-line="133" selection-start-column="22" selection-end-line="133" selection-end-column="46" /> | |
| 923 | 820 | </state> |
| 924 | 821 | </provider> |
| 925 | 822 | </entry> |
| 926 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java"> | |
| 823 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java"> | |
| 927 | 824 | <provider selected="true" editor-type-id="text-editor"> |
| 928 | - <state relative-caret-position="247"> | |
| 929 | - <caret line="203" column="33" lean-forward="true" selection-start-line="203" selection-start-column="33" selection-end-line="203" selection-end-column="33" /> | |
| 825 | + <state relative-caret-position="-109"> | |
| 826 | + <caret line="51" column="13" lean-forward="true" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="13" /> | |
| 827 | + </state> | |
| 828 | + </provider> | |
| 829 | + </entry> | |
| 830 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java"> | |
| 831 | + <provider selected="true" editor-type-id="text-editor"> | |
| 832 | + <state relative-caret-position="130"> | |
| 833 | + <caret line="13" column="25" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" /> | |
| 834 | + </state> | |
| 835 | + </provider> | |
| 836 | + </entry> | |
| 837 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html"> | |
| 838 | + <provider selected="true" editor-type-id="text-editor"> | |
| 839 | + <state relative-caret-position="144"> | |
| 840 | + <caret line="106" column="39" selection-start-line="106" selection-start-column="31" selection-end-line="106" selection-end-column="39" /> | |
| 841 | + </state> | |
| 842 | + </provider> | |
| 843 | + </entry> | |
| 844 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java"> | |
| 845 | + <provider selected="true" editor-type-id="text-editor"> | |
| 846 | + <state relative-caret-position="130"> | |
| 847 | + <caret line="156" column="62" lean-forward="true" selection-start-line="156" selection-start-column="62" selection-end-line="156" selection-end-column="62" /> | |
| 930 | 848 | <folding> |
| 931 | - <element signature="e#1625#1626#0" expanded="true" /> | |
| 932 | - <element signature="e#1652#1653#0" expanded="true" /> | |
| 849 | + <element signature="imports" expanded="true" /> | |
| 850 | + <element signature="e#2840#2841#0" expanded="true" /> | |
| 851 | + <element signature="e#2879#2880#0" expanded="true" /> | |
| 852 | + <element signature="e#6841#6842#0" expanded="true" /> | |
| 853 | + <element signature="e#6902#6903#0" expanded="true" /> | |
| 933 | 854 | </folding> |
| 934 | 855 | </state> |
| 935 | 856 | </provider> |
| ... | ... | @@ -937,7 +858,7 @@ |
| 937 | 858 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java"> |
| 938 | 859 | <provider selected="true" editor-type-id="text-editor"> |
| 939 | 860 | <state relative-caret-position="195"> |
| 940 | - <caret line="35" column="12" lean-forward="true" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" /> | |
| 861 | + <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" /> | |
| 941 | 862 | <folding> |
| 942 | 863 | <element signature="e#853#854#0" expanded="true" /> |
| 943 | 864 | <element signature="e#889#890#0" expanded="true" /> |
| ... | ... | @@ -945,31 +866,35 @@ |
| 945 | 866 | </state> |
| 946 | 867 | </provider> |
| 947 | 868 | </entry> |
| 948 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html"> | |
| 949 | - <provider selected="true" editor-type-id="text-editor"> | |
| 950 | - <state relative-caret-position="570"> | |
| 951 | - <caret line="102" column="44" selection-start-line="102" selection-start-column="22" selection-end-line="102" selection-end-column="44" /> | |
| 952 | - </state> | |
| 953 | - </provider> | |
| 954 | - </entry> | |
| 955 | 869 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java"> |
| 956 | 870 | <provider selected="true" editor-type-id="text-editor"> |
| 957 | 871 | <state relative-caret-position="200"> |
| 958 | - <caret line="500" column="12" lean-forward="true" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" /> | |
| 872 | + <caret line="500" column="12" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" /> | |
| 959 | 873 | <folding> |
| 874 | + <element signature="e#17203#17204#0" expanded="true" /> | |
| 960 | 875 | <element signature="e#17271#17272#0" expanded="true" /> |
| 961 | 876 | </folding> |
| 962 | 877 | </state> |
| 963 | 878 | </provider> |
| 964 | 879 | </entry> |
| 965 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java"> | |
| 880 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java"> | |
| 966 | 881 | <provider selected="true" editor-type-id="text-editor"> |
| 967 | - <state relative-caret-position="266"> | |
| 968 | - <caret line="180" column="8" lean-forward="true" selection-start-line="180" selection-start-column="8" selection-end-line="180" selection-end-column="8" /> | |
| 969 | - <folding> | |
| 970 | - <element signature="imports" expanded="true" /> | |
| 971 | - <element signature="e#6920#6921#0" expanded="true" /> | |
| 972 | - </folding> | |
| 882 | + <state relative-caret-position="226"> | |
| 883 | + <caret line="108" column="15" selection-start-line="108" selection-start-column="15" selection-end-line="108" selection-end-column="15" /> | |
| 884 | + </state> | |
| 885 | + </provider> | |
| 886 | + </entry> | |
| 887 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/shiro/web/filter/LogoutFilter.java"> | |
| 888 | + <provider selected="true" editor-type-id="text-editor"> | |
| 889 | + <state relative-caret-position="171"> | |
| 890 | + <caret line="56" column="33" lean-forward="true" selection-start-line="56" selection-start-column="33" selection-end-line="56" selection-end-column="33" /> | |
| 891 | + </state> | |
| 892 | + </provider> | |
| 893 | + </entry> | |
| 894 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/tool/build/BuildController.java"> | |
| 895 | + <provider selected="true" editor-type-id="text-editor"> | |
| 896 | + <state relative-caret-position="152"> | |
| 897 | + <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" /> | |
| 973 | 898 | </state> |
| 974 | 899 | </provider> |
| 975 | 900 | </entry> |
| ... | ... |
src/main/java/com/huaheng/pc/general/company/service/CompanyService.java
| ... | ... | @@ -11,7 +11,7 @@ public interface CompanyService extends IService<Company>{ |
| 11 | 11 | |
| 12 | 12 | public List<Company> selectCompanyByCurrentUserId(); |
| 13 | 13 | |
| 14 | - public List<Company> selectCompanyByUserId(); | |
| 14 | + public List<Company> selectCompanyByUserId(Integer id); | |
| 15 | 15 | |
| 16 | 16 | public AjaxResult addCompany(Company company); |
| 17 | 17 | |
| ... | ... |
src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java
| ... | ... | @@ -39,9 +39,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl |
| 39 | 39 | * @return |
| 40 | 40 | */ |
| 41 | 41 | @Override |
| 42 | - public List<Company> selectCompanyByUserId() { | |
| 42 | + public List<Company> selectCompanyByUserId(Integer id) { | |
| 43 | 43 | UserCompany condition = new UserCompany(); |
| 44 | - condition.setUserId(ShiroUtils.getUserId()); | |
| 44 | + condition.setUserId(id); | |
| 45 | 45 | List<UserCompany> userCompanys = userCompanyMapper.selectListEntityByEqual(condition); |
| 46 | 46 | Company company = new Company(); |
| 47 | 47 | company.setWarehouseCode(ShiroUtils.getWarehouseCode()); |
| ... | ... |
src/main/java/com/huaheng/pc/system/user/controller/UserController.java
| ... | ... | @@ -154,7 +154,7 @@ public class UserController extends BaseController |
| 154 | 154 | { |
| 155 | 155 | mmap.put("user", userService.selectUserById(id)); |
| 156 | 156 | mmap.put("roles", roleService.selectRolesByUserId(id)); |
| 157 | - mmap.put("companys", companyService.selectCompanyByUserId()); | |
| 157 | + mmap.put("companys", companyService.selectCompanyByUserId(id)); | |
| 158 | 158 | mmap.put("warehouses", warehouseService.selectWarehouseByUserId(id)); |
| 159 | 159 | return prefix + "/edit"; |
| 160 | 160 | } |
| ... | ... |