diff --git a/.gitignore b/.gitignore
index 0b82012..7ab7f38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,8 +29,4 @@ coverage-report
manager.iml
manage.iml
-target
-.idea/*
-*.iml
-.idea/workspace.xml
-manage.iml
+target
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0824986..5137aed 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,10 +6,9 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="a79129f2-4ff8-4d4f-8e37-d936b330ff31" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+ <list default="true" id="1b63df82-146c-45a0-9c08-2a1c7c71ce0e" name="Default Changelist" 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/common/service/impl/ContractServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/common/model/PackageBase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/model/PackageBase.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -18,106 +17,107 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
- <component name="DatabaseView">
- <option name="SHOW_INTERMEDIATE" value="true" />
- <option name="GROUP_DATA_SOURCES" value="true" />
- <option name="GROUP_SCHEMA" value="true" />
- <option name="GROUP_CONTENTS" value="false" />
- <option name="SORT_POSITIONED" value="false" />
- <option name="SHOW_EMPTY_GROUPS" value="false" />
- <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
- <option name="HIDDEN_KINDS">
- <set />
- </option>
- <expand />
- <select />
- </component>
<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/common/service/impl/ContractServiceImpl.java">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
- <caret line="1792" column="54" selection-start-line="1792" selection-start-column="54" selection-end-line="1792" selection-end-column="54" />
- <folding>
- <element signature="docComment;class#ContractServiceImpl#0" />
- </folding>
+ <state relative-caret-position="2272">
+ <caret line="171" column="42" selection-start-line="171" selection-start-column="42" selection-end-line="171" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="282">
- <caret line="39" column="355" selection-start-line="39" selection-start-column="20" selection-end-line="39" selection-end-column="355" />
+ <state relative-caret-position="4352">
+ <caret line="307" column="23" selection-start-line="307" selection-start-column="23" selection-end-line="307" selection-end-column="23" />
+ <folding>
+ <element signature="docComment;class#ContractServiceImpl#0" />
+ <element signature="e#10041#10042#0" expanded="true" />
+ <element signature="e#10068#10069#0" expanded="true" />
+ <element signature="e#10498#10499#0" expanded="true" />
+ <element signature="e#10556#10557#0" expanded="true" />
+ <element signature="e#61907#61908#0" expanded="true" />
+ <element signature="e#61958#61959#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/.gitignore">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="208">
- <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
+ <state relative-caret-position="112">
+ <caret line="13" column="67" selection-start-line="13" selection-start-column="67" selection-end-line="13" selection-end-column="67" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/dic/AuthMenuEnmm.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractBody.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="368">
- <caret line="23" column="42" selection-start-line="23" selection-start-column="42" selection-end-line="23" selection-end-column="42" />
+ <state relative-caret-position="192">
+ <caret line="14" column="27" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="27" />
+ <folding>
+ <element signature="e#738#739#0" expanded="true" />
+ <element signature="e#769#770#0" expanded="true" />
+ <element signature="e#817#818#0" expanded="true" />
+ <element signature="e#857#858#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.3.2.RELEASE/spring-data-jpa-1.3.2.RELEASE.jar!/org/springframework/data/jpa/repository/JpaRepository.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2256">
- <caret line="164" column="36" selection-start-line="164" selection-start-column="36" selection-end-line="164" selection-end-column="36" />
+ <state relative-caret-position="128">
+ <caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/PackageType.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="720">
- <caret line="58" column="37" selection-start-line="58" selection-start-column="37" selection-end-line="58" selection-end-column="37" />
+ <state relative-caret-position="160">
+ <caret line="15" column="30" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleEnum.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/PackageTypeRepository.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="128">
- <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
- <folding>
- <element signature="e#426#427#0" expanded="true" />
- <element signature="e#452#453#0" expanded="true" />
- </folding>
+ <state relative-caret-position="176">
+ <caret line="15" column="47" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/model/PackageBase.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1008">
- <caret line="96" selection-start-line="96" selection-end-line="96" />
+ <state relative-caret-position="174">
+ <caret line="59" selection-start-line="59" selection-end-line="59" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#1075#1076#0" expanded="true" />
+ <element signature="e#1102#1103#0" expanded="true" />
+ <element signature="e#1142#1143#0" expanded="true" />
+ <element signature="e#1174#1175#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/security/annotation/AuthKey.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/PackageBaseRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
- <caret line="13" selection-start-line="13" selection-end-line="13" />
+ <caret line="13" column="80" selection-start-line="13" selection-start-column="80" selection-end-line="13" selection-end-column="80" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -126,10 +126,10 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/User.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/MenuRepository.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1664">
- <caret line="176" column="14" selection-start-line="176" selection-start-column="14" selection-end-line="176" selection-end-column="14" />
+ <state relative-caret-position="80">
+ <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state>
</provider>
</entry>
@@ -145,30 +145,11 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>find/role</find>
+ <find>find/pricelevel</find>
+ <find>/contract</find>
<find>find/body</find>
- <find>/sale"</find>
- <find>contract"</find>
- <find>findByDsAndRoileRelation</find>
- <find>authSave</find>
- <find>findPayAll</find>
- <find>Authorization</find>
- <find>Collectors.toMap</find>
- <find>find/payall</find>
- <find>find</find>
- <find>update</find>
- <find>system/user</find>
- <find>/del/info</find>
- <find>pay/export</find>
- <find>setstaus</find>
- <find>CONTRACTMNG_EX</find>
- <find>payall"</find>
- <find>find"</find>
+ <find>return ResultModel.OK(campaignService.listCampaignByAppAndChannel(appid, channelid,true));</find>
</findStrings>
- <dirStrings>
- <dir>D:\java_work\git_work\manager\src</dir>
- <dir>D:\java_work\git_work\manager\src\main\java\common\controller</dir>
- </dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -176,29 +157,12 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/src/main/resources/hisdata.txt" />
- <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractSaveController.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/model/AuthDic.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/model/Auth.java" />
- <option value="$PROJECT_DIR$/src/main/java/dic/RoleEnum.java" />
- <option value="$PROJECT_DIR$/.gitignore" />
- <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/service/AuthService.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/service/impl/AuthServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/security/annotation/AuthKey.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/model/User.java" />
- <option value="$PROJECT_DIR$/src/main/java/dic/AuthMenuEnmm.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
- <option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
- <option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
+ <option value="$PROJECT_DIR$/src/main/java/common/repository/PackageBaseRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/common/model/ContractBody.java" />
+ <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/common/model/PackageBase.java" />
</list>
</option>
</component>
@@ -215,6 +179,11 @@
<option value="test" />
</list>
</option>
+ <option name="disabledProfiles">
+ <list>
+ <option value="dev" />
+ </list>
+ </option>
</component>
<component name="MavenProjectNavigator">
<treeState>
@@ -223,15 +192,6 @@
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="Profiles" type="6783ec58:MavenProjectsStructure$ProfilesNode" />
</path>
- <path>
- <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
- <item name="myweb Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
- </path>
- <path>
- <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
- <item name="myweb Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
- <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
- </path>
</expand>
<select />
</treeState>
@@ -242,13 +202,11 @@
<option name="width" value="1378" />
<option name="height" value="733" />
</component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
@@ -261,19 +219,13 @@
<select />
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
- <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
- <property name="nodejs_npm_path_reset_for_default_project" value="true" />
- </component>
- <component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="D:\java_work\git_work\manager\src\main\resources" />
- </key>
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../manager-web" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -288,7 +240,7 @@
</option>
</component>
<component name="RunManager">
- <configuration name="Tomcat 8.5.32" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.32" ALTERNATIVE_JRE_ENABLED="false" nameIsGenerated="true">
+ <configuration name="tomcat" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.321" ALTERNATIVE_JRE_ENABLED="false">
<option name="BROWSER_ID" value="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
<option name="UPDATING_POLICY" value="restart-server" />
<deployment>
@@ -299,9 +251,8 @@
</artifact>
</deployment>
<server-settings>
- <option name="BASE_DIRECTORY_NAME" value="Unnamed_manage_2" />
- <option name="HTTP_PORT" value="9001" />
- <option name="JNDI_PORT" value="1091" />
+ <option name="BASE_DIRECTORY_NAME" value="Unnamed_manage" />
+ <option name="HTTP_PORT" value="8083" />
</server-settings>
<predefined_log_file enabled="true" id="Tomcat" />
<predefined_log_file enabled="true" id="Tomcat Catalina" />
@@ -309,7 +260,7 @@
<predefined_log_file id="Tomcat Host Manager" />
<predefined_log_file id="Tomcat Localhost Access" />
<RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="52963" />
+ <option name="DEBUG_PORT" value="62000" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
@@ -369,487 +320,198 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="a79129f2-4ff8-4d4f-8e37-d936b330ff31" name="Default Changelist" comment="" />
- <created>1567681369142</created>
+ <changelist id="1b63df82-146c-45a0-9c08-2a1c7c71ce0e" name="Default Changelist" comment="" />
+ <created>1563854325602</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1567681369142</updated>
- <workItem from="1567681372397" duration="3186000" />
- <workItem from="1569236308524" duration="1987000" />
- <workItem from="1571106610194" duration="825000" />
- <workItem from="1571108916082" duration="310000" />
- <workItem from="1571122128098" duration="3539000" />
- <workItem from="1571128673298" duration="13926000" />
- <workItem from="1571214457743" duration="34797000" />
- <workItem from="1571624737960" duration="1532000" />
+ <updated>1563854325602</updated>
+ <workItem from="1563854327154" duration="1880000" />
+ <workItem from="1563867413018" duration="605000" />
+ <workItem from="1563954839096" duration="6397000" />
+ <workItem from="1563965424775" duration="641000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="60102000" />
- </component>
- <component name="TodoView">
- <todo-panel id="selected-file">
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- <todo-panel id="all">
- <are-packages-shown value="true" />
- <is-autoscroll-to-source value="true" />
- </todo-panel>
+ <option name="totallyTimeSpent" value="7003000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21860817" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.119335346" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Web" order="2" side_tool="true" />
<window_info id="Designer" order="3" />
- <window_info id="Favorites" order="4" side_tool="true" />
+ <window_info id="UI Designer" order="4" />
+ <window_info id="Favorites" order="5" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
- <window_info anchor="bottom" id="Find" order="1" weight="0.3295082" />
- <window_info anchor="bottom" id="Run" order="2" weight="0.3295082" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.57213116" />
+ <window_info anchor="bottom" id="Find" order="1" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.49185666" />
<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.3295082" />
+ <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
- <window_info anchor="bottom" id="Spring" order="9" />
- <window_info anchor="bottom" id="Database Changes" order="10" />
- <window_info anchor="bottom" id="Terminal" order="11" weight="0.8196721" />
+ <window_info anchor="bottom" id="Database Changes" order="9" />
+ <window_info anchor="bottom" id="Spring" order="10" />
+ <window_info anchor="bottom" id="Terminal" order="11" />
<window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
- <window_info anchor="bottom" id="Messages" order="13" weight="0.3295082" />
- <window_info anchor="bottom" id="Application Servers" order="14" weight="0.3295082" />
- <window_info anchor="bottom" id="Java Enterprise" order="15" />
+ <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32899022" />
+ <window_info anchor="bottom" id="Application Servers" order="14" weight="0.32899022" />
+ <window_info anchor="bottom" id="Messages" order="15" weight="0.32899022" />
<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" />
- <window_info anchor="right" id="Database" order="3" weight="0.32980332" />
- <window_info anchor="right" id="Maven" order="4" weight="0.1301059" />
- <window_info anchor="right" id="Remote Host" order="5" />
- <window_info anchor="right" id="Bean Validation" order="6" />
- <window_info anchor="right" id="Palette	" order="7" />
+ <window_info anchor="right" id="Maven" order="1" visible="true" weight="0.18429004" />
+ <window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
+ <window_info anchor="right" id="Palette" order="4" />
+ <window_info anchor="right" id="Database" order="5" />
+ <window_info anchor="right" id="Remote Host" order="6" />
+ <window_info anchor="right" id="Bean Validation" order="7" />
+ <window_info anchor="right" id="Palette	" order="8" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
- <component name="XDebuggerManager">
- <breakpoint-manager>
- <breakpoints>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java</url>
- <line>1627</line>
- <properties />
- <option name="timeStamp" value="2" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java</url>
- <line>58</line>
- <properties />
- <option name="timeStamp" value="3" />
- </line-breakpoint>
- </breakpoints>
- </breakpoint-manager>
- </component>
<component name="editorHistoryManager">
- <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaEE/lib/javaee-impl.jar!/standardSchemas/web-common_3_1.xsd">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2272">
- <caret line="142" column="6" selection-start-line="142" selection-start-column="6" selection-end-line="142" selection-end-column="6" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/resolvers/LoginUserMethodArgumentsResolver.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="160">
- <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/MenuService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="128">
- <caret line="10" column="15" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/MenuServiceImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/adi/dic/PackageEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
- <caret line="23" column="22" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/exception/MethodNotSupportException.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="32">
- <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/cors/CorsFilter.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="128">
- <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+ <caret line="5" column="4" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/MenuController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Notice.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="304">
- <caret line="30" column="43" selection-start-line="30" selection-start-column="43" selection-end-line="30" selection-end-column="43" />
+ <state relative-caret-position="256">
+ <caret line="18" column="2" selection-start-line="18" selection-start-column="2" selection-end-line="19" selection-end-column="19" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/SaleAuthController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="160">
- <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractChange.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="16" column="27" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ChangeDelDetail.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Menu.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="96">
- <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+ <state relative-caret-position="-80">
+ <caret line="11" column="4" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="20" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/KeyValue.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/PaymentRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
- <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+ <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Menu.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
- <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+ <caret line="10" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ChangeDelInfo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="19" selection-start-line="19" selection-end-line="20" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/BackVisit.java">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="112">
- <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+ <state relative-caret-position="464">
+ <caret line="113" column="61" selection-start-line="113" selection-start-column="54" selection-end-line="113" selection-end-column="61" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/AuthDic.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="192">
- <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/SalesRepository.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="224">
- <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
+ <state relative-caret-position="2272">
+ <caret line="171" column="42" selection-start-line="171" selection-start-column="42" selection-end-line="171" selection-end-column="42" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Auth.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="544">
- <caret line="49" column="35" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" />
+ <state relative-caret-position="4352">
+ <caret line="307" column="23" selection-start-line="307" selection-start-column="23" selection-end-line="307" selection-end-column="23" />
<folding>
- <element signature="e#783#784#0" expanded="true" />
- <element signature="e#832#833#0" expanded="true" />
- <element signature="e#867#868#0" expanded="true" />
+ <element signature="docComment;class#ContractServiceImpl#0" />
+ <element signature="e#10041#10042#0" expanded="true" />
+ <element signature="e#10068#10069#0" expanded="true" />
+ <element signature="e#10498#10499#0" expanded="true" />
+ <element signature="e#10556#10557#0" expanded="true" />
+ <element signature="e#61907#61908#0" expanded="true" />
+ <element signature="e#61958#61959#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/office/service/BussinussManService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
- <caret line="7" column="9" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
+ <caret line="13" column="67" selection-start-line="13" selection-start-column="67" selection-end-line="13" selection-end-column="67" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/office/service/impl/BussinussManServiceImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractBody.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
- <caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.0.1/javax.servlet-api-3.0.1.jar!/javax/servlet/http/HttpServletRequest.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="194">
- <caret line="26" column="11" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="11" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/TokenManager.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="232">
- <caret line="29" column="11" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="11" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/RedisTokenManager.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="119" column="16" selection-start-line="119" selection-start-column="16" selection-end-line="119" selection-end-column="16" />
+ <caret line="14" column="27" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="27" />
<folding>
- <element signature="e#2977#2978#0" expanded="true" />
- <element signature="e#3023#3024#0" expanded="true" />
- <element signature="e#3589#3590#0" expanded="true" />
- <element signature="e#3648#3649#0" expanded="true" />
- <element signature="e#5018#5019#0" expanded="true" />
- <element signature="e#5073#5074#0" expanded="true" />
+ <element signature="e#738#739#0" expanded="true" />
+ <element signature="e#769#770#0" expanded="true" />
+ <element signature="e#817#818#0" expanded="true" />
+ <element signature="e#857#858#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/AbstractTokenManager.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="202">
- <caret line="68" column="28" selection-start-line="68" selection-start-column="28" selection-end-line="68" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="402">
- <caret line="59" column="51" selection-start-line="59" selection-start-column="51" selection-end-line="59" selection-end-column="51" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="312">
- <caret line="75" selection-start-line="75" selection-end-line="75" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.3.4.RELEASE/spring-core-4.3.4.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1424">
- <caret line="104" selection-start-line="104" selection-end-line="104" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/AppService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="112">
- <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="369">
- <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="112">
- <caret line="47" selection-start-line="47" selection-end-line="47" selection-end-column="8" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/AuthService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="96">
- <caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="432">
- <caret line="98" column="19" selection-start-line="98" selection-start-column="19" selection-end-line="98" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="224">
- <caret line="20" column="17" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="79">
- <caret line="107" selection-start-line="107" selection-end-line="107" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="80">
- <caret line="5" selection-start-line="5" selection-end-line="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractStatusEnum.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="96">
- <caret line="6" column="12" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AuthServiceImpl.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/1.3.2.RELEASE/spring-data-jpa-1.3.2.RELEASE.jar!/org/springframework/data/jpa/repository/JpaRepository.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
- <caret line="32" selection-start-line="32" selection-end-line="32" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/annotation/CurrentAccount.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/PackageType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
- <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/security/annotation/Authorization.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="96">
- <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4976">
- <caret line="344" column="44" selection-start-line="344" selection-start-column="44" selection-end-line="344" selection-end-column="44" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/dic/AuthMenuEnmm.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="368">
- <caret line="23" column="42" selection-start-line="23" selection-start-column="42" selection-end-line="23" selection-end-column="42" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2256">
- <caret line="164" column="36" selection-start-line="164" selection-start-column="36" selection-end-line="164" selection-end-column="36" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="720">
- <caret line="58" column="37" selection-start-line="58" selection-start-column="37" selection-end-line="58" selection-end-column="37" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleEnum.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="128">
- <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
- <folding>
- <element signature="e#426#427#0" expanded="true" />
- <element signature="e#452#453#0" expanded="true" />
- </folding>
+ <caret line="15" column="30" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="30" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/PackageTypeRepository.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1008">
- <caret line="96" selection-start-line="96" selection-end-line="96" />
+ <state relative-caret-position="176">
+ <caret line="15" column="47" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="47" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/security/annotation/AuthKey.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/PackageBaseRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
- <caret line="13" selection-start-line="13" selection-end-line="13" />
+ <caret line="13" column="80" selection-start-line="13" selection-start-column="80" selection-end-line="13" selection-end-column="80" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/model/User.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/MenuRepository.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1664">
- <caret line="176" column="14" selection-start-line="176" selection-start-column="14" selection-end-line="176" selection-end-column="14" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="282">
- <caret line="39" column="355" selection-start-line="39" selection-start-column="20" selection-end-line="39" selection-end-column="355" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/.gitignore">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="208">
- <caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
+ <state relative-caret-position="80">
+ <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/common/model/PackageBase.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
- <caret line="1792" column="54" selection-start-line="1792" selection-start-column="54" selection-end-line="1792" selection-end-column="54" />
+ <state relative-caret-position="174">
+ <caret line="59" selection-start-line="59" selection-end-line="59" />
<folding>
- <element signature="docComment;class#ContractServiceImpl#0" />
+ <element signature="imports" expanded="true" />
+ <element signature="e#1075#1076#0" expanded="true" />
+ <element signature="e#1102#1103#0" expanded="true" />
+ <element signature="e#1142#1143#0" expanded="true" />
+ <element signature="e#1174#1175#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
- <component name="masterDetails">
- <states>
- <state key="ProjectJDKs.UI">
- <settings>
- <last-edited>1.8</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- </states>
- </component>
</project>
\ No newline at end of file
diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java
index 8b3e29b..4827e10 100644
--- a/src/main/java/common/service/impl/ContractServiceImpl.java
+++ b/src/main/java/common/service/impl/ContractServiceImpl.java
@@ -1805,14 +1805,14 @@ public class ContractServiceImpl implements ContractService {
if (RoleEnum.FINANCE.getKey().equals(loginAccount.getRole())) {
- list = filterContractMoney(codesList, authdata, list, 1);
+ filterContractMoney(codesList, authdata, list, 1);
} else if (RoleEnum.SALSEMAN.getKey().equals(loginAccount.getRole())) {
- list = filterContractMoney(codesList, authdata, list, 2);
+ filterContractMoney(codesList, authdata, list, 2);
} else if (RoleEnum.PM.getKey().equals(loginAccount.getRole())) {
- list = filterContractMoney(codesList, authdata, list, 3);
+ filterContractMoney(codesList, authdata, list, 3);
}
}
@@ -1844,17 +1844,17 @@ public class ContractServiceImpl implements ContractService {
return list;
}
- private List<ContractMoney> filterContractMoney(List<String> codesList, Map<String, Object> authdata, List<ContractMoney> list, int nextIndex) {
+ private void filterContractMoney(List<String> codesList, Map<String, Object> authdata, List<ContractMoney> list, int nextIndex) {
if (codesList == null || codesList.size() == 0) {
- return list;
+ return;
}
Map<String, String> dicdata = contractRepository.findByContractCode(
codesList).stream().
collect(Collectors.toMap(p -> p[0].toString(), p -> p[nextIndex].toString(), (key1, key2) -> key1));
- return list.stream().filter(p -> authdata.get(dicdata.get(p.getContractCode())) == null ? false : true).collect(Collectors.toList());
+ list.stream().filter(p -> authdata.get(dicdata.get(p.getContractCode())) == null ? false : true).collect(Collectors.toList());
}