Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

doc/就业驿站管理系统.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{2D964471-9870-48BE-90E9-524D40D03B42}" Label="" LastModificationDate="1713834291" Name="就业驿站管理系统" Objects="526" Symbols="45" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
+<?PowerDesigner AppLocale="UTF16" ID="{2D964471-9870-48BE-90E9-524D40D03B42}" Label="" LastModificationDate="1713834576" Name="就业驿站管理系统" Objects="527" Symbols="45" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.0.0.3514"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -4662,8 +4662,8 @@ Reference.ParentRole 1</a:SymbolContent>
 <o:ReferenceSymbol Id="o50">
 <a:CreationDate>1701661162</a:CreationDate>
 <a:ModificationDate>1703661889</a:ModificationDate>
-<a:Rect>((-121277,61775), (-99347,77179))</a:Rect>
-<a:ListOfPoints>((-99747,76779),(-115326,76779),(-115326,62175),(-120877,62175))</a:ListOfPoints>
+<a:Rect>((-121277,61355), (-99347,77179))</a:Rect>
+<a:ListOfPoints>((-99747,76779),(-115326,76779),(-115326,61755),(-120877,61755))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16744448</a:LineColor>
@@ -4716,8 +4716,8 @@ DESTINATION 0 新宋体,8,N</a:FontList>
 <o:ReferenceSymbol Id="o55">
 <a:CreationDate>1703661452</a:CreationDate>
 <a:ModificationDate>1703661452</a:ModificationDate>
-<a:Rect>((-153107,72949), (-124224,81267))</a:Rect>
-<a:ListOfPoints>((-127224,73349),(-127224,80867),(-152707,80867))</a:ListOfPoints>
+<a:Rect>((-153107,72949), (-126824,81267))</a:Rect>
+<a:ListOfPoints>((-127224,73349),(-139058,73349),(-139058,80867),(-152707,80867))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>4194432</a:LineColor>
@@ -5254,7 +5254,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:CreationDate>1701660880</a:CreationDate>
 <a:ModificationDate>1703661889</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-133571,60388), (-120877,86311))</a:Rect>
+<a:Rect>((-133571,59901), (-120877,86798))</a:Rect>
 <a:LineColor>16512</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -8917,7 +8917,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Code>pc_site_user</a:Code>
 <a:CreationDate>1701660880</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
-<a:ModificationDate>1713834291</a:ModificationDate>
+<a:ModificationDate>1713834576</a:ModificationDate>
 <a:Modifier>bowin_89</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -9191,9 +9191,20 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(200)</a:DataType>
 <a:Length>200</a:Length>
 </o:Column>
+<o:Column Id="o415">
+<a:ObjectID>FF1E8C9C-1FED-4433-9032-B010B1E08342</a:ObjectID>
+<a:Name>现住址</a:Name>
+<a:Code>Address</a:Code>
+<a:CreationDate>1713834547</a:CreationDate>
+<a:Creator>bowin_89</a:Creator>
+<a:ModificationDate>1713834576</a:ModificationDate>
+<a:Modifier>bowin_89</a:Modifier>
+<a:DataType>varchar(200)</a:DataType>
+<a:Length>200</a:Length>
+</o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o415">
+<o:Key Id="o416">
 <a:ObjectID>1F5C4356-EFB3-4E3C-98D8-E729B67196A8</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -9207,7 +9218,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o415"/>
+<o:Key Ref="o416"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o89">
@@ -9220,7 +9231,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Modifier>bowinuser</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o416">
+<o:Column Id="o417">
 <a:ObjectID>C80E5F93-194F-49DF-9DF6-BC747FF152E0</a:ObjectID>
 <a:Name>编码</a:Name>
 <a:Code>code</a:Code>
@@ -9231,7 +9242,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(18)</a:DataType>
 <a:Length>18</a:Length>
 </o:Column>
-<o:Column Id="o417">
+<o:Column Id="o418">
 <a:ObjectID>C47BD2A2-6AC7-4B2A-919D-F9645665FD36</a:ObjectID>
 <a:Name>名称</a:Name>
 <a:Code>name</a:Code>
@@ -9242,7 +9253,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(100)</a:DataType>
 <a:Length>100</a:Length>
 </o:Column>
-<o:Column Id="o418">
+<o:Column Id="o419">
 <a:ObjectID>1E5B5253-BA46-4E05-B5E2-8DA057293636</a:ObjectID>
 <a:Name>父级编码</a:Name>
 <a:Code>fid</a:Code>
@@ -9253,7 +9264,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(18)</a:DataType>
 <a:Length>18</a:Length>
 </o:Column>
-<o:Column Id="o419">
+<o:Column Id="o420">
 <a:ObjectID>6BD14B97-705C-476F-BFC7-F6F9F213DA43</a:ObjectID>
 <a:Name>全称</a:Name>
 <a:Code>fullname</a:Code>
@@ -9264,7 +9275,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(1000)</a:DataType>
 <a:Length>1000</a:Length>
 </o:Column>
-<o:Column Id="o420">
+<o:Column Id="o421">
 <a:ObjectID>5FDBB250-1BD2-466D-8DBA-2CDA5DC52523</a:ObjectID>
 <a:Name>级别</a:Name>
 <a:Code>lv</a:Code>
@@ -9287,7 +9298,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Modifier>bowinuser</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o421">
+<o:Column Id="o422">
 <a:ObjectID>0A4729AB-5CEA-45D4-A385-DA9E0E91B589</a:ObjectID>
 <a:Name>求职岗位ID</a:Name>
 <a:Code>ProfessionID</a:Code>
@@ -9299,7 +9310,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o422">
+<o:Column Id="o423">
 <a:ObjectID>692A7050-890E-4B71-929B-E7358583F565</a:ObjectID>
 <a:Name>父级ID</a:Name>
 <a:Code>ParentProfessionID</a:Code>
@@ -9310,7 +9321,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o423">
+<o:Column Id="o424">
 <a:ObjectID>B2751E64-1214-4B5A-8B30-DA00A7187DA2</a:ObjectID>
 <a:Name>求职岗位名称</a:Name>
 <a:Code>ProfeesionName</a:Code>
@@ -9321,7 +9332,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(20)</a:DataType>
 <a:Length>20</a:Length>
 </o:Column>
-<o:Column Id="o424">
+<o:Column Id="o425">
 <a:ObjectID>6123E68E-EAD1-471C-A363-6337107E329F</a:ObjectID>
 <a:Name>排列顺序</a:Name>
 <a:Code>OrderNo</a:Code>
@@ -9331,7 +9342,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Modifier>bowinuser</a:Modifier>
 <a:DataType>int</a:DataType>
 </o:Column>
-<o:Column Id="o425">
+<o:Column Id="o426">
 <a:ObjectID>F31F0732-903C-46A3-AF43-8490293F2688</a:ObjectID>
 <a:Name>状态</a:Name>
 <a:Code>Status</a:Code>
@@ -9343,7 +9354,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o426">
+<o:Key Id="o427">
 <a:ObjectID>3276AAF8-292A-4E7C-B134-86D43B6AC789</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -9352,12 +9363,12 @@ LABL 0 Arial,8,N</a:FontList>
 <a:ModificationDate>1713147124</a:ModificationDate>
 <a:Modifier>bowinuser</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o421"/>
+<o:Column Ref="o422"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o426"/>
+<o:Key Ref="o427"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o92">
@@ -9370,7 +9381,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Modifier>bowin90</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o427">
+<o:Column Id="o428">
 <a:ObjectID>EF6526C0-2FEE-42BB-B990-DFF9864B4345</a:ObjectID>
 <a:Name>唯一ID</a:Name>
 <a:Code>messageStatusId</a:Code>
@@ -9383,7 +9394,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Length>50</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o428">
+<o:Column Id="o429">
 <a:ObjectID>4B3530E1-1442-4CD4-B3C8-ECB19BB6F2DB</a:ObjectID>
 <a:Name>微信openId</a:Name>
 <a:Code>openId</a:Code>
@@ -9395,7 +9406,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(300)</a:DataType>
 <a:Length>300</a:Length>
 </o:Column>
-<o:Column Id="o429">
+<o:Column Id="o430">
 <a:ObjectID>859BDCF2-E3E7-4113-AA65-7FF0F26DD2C3</a:ObjectID>
 <a:Name>业务ID</a:Name>
 <a:Code>sourceId</a:Code>
@@ -9407,7 +9418,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o430">
+<o:Column Id="o431">
 <a:ObjectID>F21E97C2-B057-4156-BB9B-DD9059270B12</a:ObjectID>
 <a:Name>推送内容</a:Name>
 <a:Code>content</a:Code>
@@ -9418,7 +9429,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Comment>推送内容</a:Comment>
 <a:DataType>text</a:DataType>
 </o:Column>
-<o:Column Id="o431">
+<o:Column Id="o432">
 <a:ObjectID>AC18E990-27B9-4F67-A16C-23925A51DCFA</a:ObjectID>
 <a:Name>url</a:Name>
 <a:Code>url</a:Code>
@@ -9429,7 +9440,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(1000)</a:DataType>
 <a:Length>1000</a:Length>
 </o:Column>
-<o:Column Id="o432">
+<o:Column Id="o433">
 <a:ObjectID>C2AE553A-6601-4B06-B346-50EE169BE412</a:ObjectID>
 <a:Name>推送时间</a:Name>
 <a:Code>sendTime</a:Code>
@@ -9440,7 +9451,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Comment>推送时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o433">
+<o:Column Id="o434">
 <a:ObjectID>16E88D0D-B4B6-43B2-A16E-7C2A64E17A25</a:ObjectID>
 <a:Name>状态</a:Name>
 <a:Code>recordStatus</a:Code>
@@ -9451,7 +9462,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Comment>状态，0未推送，1已推送</a:Comment>
 <a:DataType>int</a:DataType>
 </o:Column>
-<o:Column Id="o434">
+<o:Column Id="o435">
 <a:ObjectID>73ED08AC-7B97-4372-A56C-EDC66E8CC4AB</a:ObjectID>
 <a:Name>创建人</a:Name>
 <a:Code>createUserID</a:Code>
@@ -9463,7 +9474,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o435">
+<o:Column Id="o436">
 <a:ObjectID>771B6440-956C-41CF-A3C9-F67876E4936A</a:ObjectID>
 <a:Name>创建时间</a:Name>
 <a:Code>createTime</a:Code>
@@ -9474,7 +9485,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Comment>创建时间</a:Comment>
 <a:DataType>datetime</a:DataType>
 </o:Column>
-<o:Column Id="o436">
+<o:Column Id="o437">
 <a:ObjectID>3A8D896F-2710-4FB6-8FC6-3D7DAA2E2B47</a:ObjectID>
 <a:Name>修改人</a:Name>
 <a:Code>modifyUserID</a:Code>
@@ -9486,7 +9497,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o437">
+<o:Column Id="o438">
 <a:ObjectID>7C39DC5E-DB29-459A-A803-CF3EAABD4143</a:ObjectID>
 <a:Name>修改时间</a:Name>
 <a:Code>modifyTime</a:Code>
@@ -9499,7 +9510,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o438">
+<o:Key Id="o439">
 <a:ObjectID>B8FCFC4F-8EE5-4A53-91B0-10071641EE3C</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -9508,12 +9519,12 @@ LABL 0 Arial,8,N</a:FontList>
 <a:ModificationDate>1713437121</a:ModificationDate>
 <a:Modifier>bowin90</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o427"/>
+<o:Column Ref="o428"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o438"/>
+<o:Key Ref="o439"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o93">
@@ -9526,7 +9537,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Modifier>bowin90</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o439">
+<o:Column Id="o440">
 <a:ObjectID>C7465F14-9DE1-4590-B922-6BA638A38A3D</a:ObjectID>
 <a:Name>微信消息模板编码</a:Name>
 <a:Code>templateNo</a:Code>
@@ -9539,7 +9550,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o440">
+<o:Column Id="o441">
 <a:ObjectID>9454C1FA-0CE3-4BA4-9448-E005B1D204B0</a:ObjectID>
 <a:Name>微信消息模板名称</a:Name>
 <a:Code>templateName</a:Code>
@@ -9551,7 +9562,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 </o:Column>
-<o:Column Id="o441">
+<o:Column Id="o442">
 <a:ObjectID>907393F7-CDCA-42B7-AA04-B541C0EE497B</a:ObjectID>
 <a:Name>微信消息模板ID</a:Name>
 <a:Code>templateId</a:Code>
@@ -9563,7 +9574,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:DataType>varchar(300)</a:DataType>
 <a:Length>300</a:Length>
 </o:Column>
-<o:Column Id="o442">
+<o:Column Id="o443">
 <a:ObjectID>8600CCC7-2960-4703-9562-AE96E2CF3F97</a:ObjectID>
 <a:Name>模板跳转url</a:Name>
 <a:Code>url</a:Code>
@@ -9577,7 +9588,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o443">
+<o:Key Id="o444">
 <a:ObjectID>F1B3FF1D-0B67-4C0A-860E-BB3EFCFBCA1F</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -9586,12 +9597,12 @@ LABL 0 Arial,8,N</a:FontList>
 <a:ModificationDate>1713441468</a:ModificationDate>
 <a:Modifier>bowin90</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o439"/>
+<o:Column Ref="o440"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o443"/>
+<o:Key Ref="o444"/>
 </c:PrimaryKey>
 </o:Table>
 <o:Table Id="o94">
@@ -9604,7 +9615,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Modifier>bowin90</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:Columns>
-<o:Column Id="o444">
+<o:Column Id="o445">
 <a:ObjectID>F5E9C7FD-BC70-4A21-B07D-072CDA88A141</a:ObjectID>
 <a:Name>微信消息模板编码</a:Name>
 <a:Code>templateNo</a:Code>
@@ -9617,7 +9628,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Length>10</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o445">
+<o:Column Id="o446">
 <a:ObjectID>C1D08037-2874-40A3-BCF2-FF8CE3920A41</a:ObjectID>
 <a:Name>wxFieldName</a:Name>
 <a:Code>wxFieldName</a:Code>
@@ -9630,7 +9641,7 @@ LABL 0 Arial,8,N</a:FontList>
 <a:Length>30</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
 </o:Column>
-<o:Column Id="o446">
+<o:Column Id="o447">
 <a:ObjectID>8CC02B30-DA95-4D69-8223-4F4DDCAA310E</a:ObjectID>
 <a:Name>sysFieldName</a:Name>
 <a:Code>sysFieldName</a:Code>
@@ -9644,7 +9655,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Column>
 </c:Columns>
 <c:Keys>
-<o:Key Id="o447">
+<o:Key Id="o448">
 <a:ObjectID>A9ECA0F3-2901-45AB-9B65-AEB7A716B0BA</a:ObjectID>
 <a:Name>Key_1</a:Name>
 <a:Code>Key_1</a:Code>
@@ -9653,13 +9664,13 @@ LABL 0 Arial,8,N</a:FontList>
 <a:ModificationDate>1713443103</a:ModificationDate>
 <a:Modifier>bowin90</a:Modifier>
 <c:Key.Columns>
-<o:Column Ref="o444"/>
 <o:Column Ref="o445"/>
+<o:Column Ref="o446"/>
 </c:Key.Columns>
 </o:Key>
 </c:Keys>
 <c:PrimaryKey>
-<o:Key Ref="o447"/>
+<o:Key Ref="o448"/>
 </c:PrimaryKey>
 </o:Table>
 </c:Tables>
@@ -9685,7 +9696,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o127"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o448">
+<o:ReferenceJoin Id="o449">
 <a:ObjectID>54F04187-9C05-49AC-A2AE-0F6805B87FA6</a:ObjectID>
 <a:CreationDate>1700727651</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -9721,7 +9732,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o112"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o449">
+<o:ReferenceJoin Id="o450">
 <a:ObjectID>1C1F4C11-0B3A-4093-A82E-6A9FD4FD25D0</a:ObjectID>
 <a:CreationDate>1700727797</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -9757,7 +9768,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o112"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o450">
+<o:ReferenceJoin Id="o451">
 <a:ObjectID>40A0CA90-8614-4815-97AD-0EBD6F0B71D9</a:ObjectID>
 <a:CreationDate>1700730987</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -9793,7 +9804,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o112"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o451">
+<o:ReferenceJoin Id="o452">
 <a:ObjectID>FB4FAA07-CE83-4FCA-A8D0-3EAF2B4D6E07</a:ObjectID>
 <a:CreationDate>1700731007</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -9829,7 +9840,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o163"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o452">
+<o:ReferenceJoin Id="o453">
 <a:ObjectID>D517805A-E4C7-4403-8465-67312BEA0D62</a:ObjectID>
 <a:CreationDate>1700731026</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -9865,7 +9876,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o270"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o453">
+<o:ReferenceJoin Id="o454">
 <a:ObjectID>7A61F341-556C-4479-A342-A7646603F9F3</a:ObjectID>
 <a:CreationDate>1700731151</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -9901,7 +9912,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o221"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o454">
+<o:ReferenceJoin Id="o455">
 <a:ObjectID>690001A1-24C5-4BB0-860C-27E191E15580</a:ObjectID>
 <a:CreationDate>1700731191</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -9937,7 +9948,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o112"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o455">
+<o:ReferenceJoin Id="o456">
 <a:ObjectID>0B8B962D-B921-4C57-9B91-8C15F33BED75</a:ObjectID>
 <a:CreationDate>1700731590</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -9973,7 +9984,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o270"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o456">
+<o:ReferenceJoin Id="o457">
 <a:ObjectID>CF00EFE5-091D-4B44-9BC6-78E0E41801E0</a:ObjectID>
 <a:CreationDate>1700731650</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10009,7 +10020,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o270"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o457">
+<o:ReferenceJoin Id="o458">
 <a:ObjectID>451F9C5E-5174-4834-8447-8BFBF152415E</a:ObjectID>
 <a:CreationDate>1700731691</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10045,7 +10056,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o270"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o458">
+<o:ReferenceJoin Id="o459">
 <a:ObjectID>348ADE0B-66DB-4664-989D-92DEC0AF1BCD</a:ObjectID>
 <a:CreationDate>1700731736</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10081,7 +10092,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o221"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o459">
+<o:ReferenceJoin Id="o460">
 <a:ObjectID>ABE69D56-EB12-409A-94E0-7250DB96B800</a:ObjectID>
 <a:CreationDate>1700731802</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10117,7 +10128,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o270"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o460">
+<o:ReferenceJoin Id="o461">
 <a:ObjectID>08EDE705-0BB1-4605-9A44-22080589321A</a:ObjectID>
 <a:CreationDate>1700731807</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10153,7 +10164,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o357"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o461">
+<o:ReferenceJoin Id="o462">
 <a:ObjectID>9948DA1B-7F6D-4BFD-944D-78B0BB942C79</a:ObjectID>
 <a:CreationDate>1701227667</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10189,7 +10200,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o188"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o462">
+<o:ReferenceJoin Id="o463">
 <a:ObjectID>B70423BB-9802-457F-AE23-4CBF7D842F4E</a:ObjectID>
 <a:CreationDate>1701660221</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10222,7 +10233,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Table Ref="o86"/>
 </c:ChildTable>
 <c:Joins>
-<o:ReferenceJoin Id="o463">
+<o:ReferenceJoin Id="o464">
 <a:ObjectID>5E4AB2FC-A524-45F4-9FE1-E46F2AFC9564</a:ObjectID>
 <a:CreationDate>1701661219</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10258,7 +10269,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o112"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o464">
+<o:ReferenceJoin Id="o465">
 <a:ObjectID>3629C8A8-9FDA-42D0-825C-8B0997759790</a:ObjectID>
 <a:CreationDate>1701934197</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10294,7 +10305,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o383"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o465">
+<o:ReferenceJoin Id="o466">
 <a:ObjectID>2374EDD3-256A-4744-B800-C1EAC2B3A8BA</a:ObjectID>
 <a:CreationDate>1703661458</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10327,10 +10338,10 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Table Ref="o74"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o415"/>
+<o:Key Ref="o416"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o466">
+<o:ReferenceJoin Id="o467">
 <a:ObjectID>E869B4C1-58EF-4215-B2EE-702BC081782A</a:ObjectID>
 <a:CreationDate>1703661902</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10366,7 +10377,7 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Key Ref="o221"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o467">
+<o:ReferenceJoin Id="o468">
 <a:ObjectID>9CCCDB43-37CB-4FEC-9728-5E1C604B931C</a:ObjectID>
 <a:CreationDate>1703727031</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
@@ -10399,17 +10410,17 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Table Ref="o81"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o426"/>
+<o:Key Ref="o427"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o468">
+<o:ReferenceJoin Id="o469">
 <a:ObjectID>69BDF72C-5720-4C82-887C-A74DF7E2A01D</a:ObjectID>
 <a:CreationDate>1713147069</a:CreationDate>
 <a:Creator>bowinuser</a:Creator>
 <a:ModificationDate>1713147124</a:ModificationDate>
 <a:Modifier>bowinuser</a:Modifier>
 <c:Object1>
-<o:Column Ref="o421"/>
+<o:Column Ref="o422"/>
 </c:Object1>
 <c:Object2>
 <o:Column Ref="o301"/>
@@ -10435,27 +10446,27 @@ LABL 0 Arial,8,N</a:FontList>
 <o:Table Ref="o94"/>
 </c:ChildTable>
 <c:ParentKey>
-<o:Key Ref="o443"/>
+<o:Key Ref="o444"/>
 </c:ParentKey>
 <c:Joins>
-<o:ReferenceJoin Id="o469">
+<o:ReferenceJoin Id="o470">
 <a:ObjectID>EA16D89A-A814-4871-B1D9-CCB394F38D05</a:ObjectID>
 <a:CreationDate>1713443051</a:CreationDate>
 <a:Creator>bowin90</a:Creator>
 <a:ModificationDate>1713443051</a:ModificationDate>
 <a:Modifier>bowin90</a:Modifier>
 <c:Object1>
-<o:Column Ref="o439"/>
+<o:Column Ref="o440"/>
 </c:Object1>
 <c:Object2>
-<o:Column Ref="o444"/>
+<o:Column Ref="o445"/>
 </c:Object2>
 </o:ReferenceJoin>
 </c:Joins>
 </o:Reference>
 </c:References>
 <c:DefaultGroups>
-<o:Group Id="o470">
+<o:Group Id="o471">
 <a:ObjectID>9EC8D640-B68B-4B22-9ECC-8604531BD893</a:ObjectID>
 <a:Name>PUBLIC</a:Name>
 <a:Code>PUBLIC</a:Code>
@@ -10466,7 +10477,7 @@ LABL 0 Arial,8,N</a:FontList>
 </o:Group>
 </c:DefaultGroups>
 <c:TargetModels>
-<o:TargetModel Id="o471">
+<o:TargetModel Id="o472">
 <a:ObjectID>F5495246-0AD0-47FB-87F5-4932E41412CF</a:ObjectID>
 <a:Name>MySQL 5.0</a:Name>
 <a:Code>MYSQL50</a:Code>

h5app/src/components/postSelection.vue

@@ -0,0 +1,349 @@
+<style>
+ion-modal {
+  --height: 50%;
+  --border-radius: 16px;
+  --box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+}
+
+ion-modal::part(backdrop) {
+  background: rgba(209, 213, 219);
+  opacity: 1;
+}
+
+ion-modal ion-toolbar {
+  --background: white;
+  --color: white;
+}
+
+ion-toolbar {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+  --padding-start: 0;
+  --padding-end: 0;
+}
+
+ion-toolbar ion-item:first-child {
+  --inner-border-width: 0 0 0 0;
+  text-align: center;
+}
+
+ion-toolbar ion-item:last-child {
+  --padding-start: 0;
+  --inner-padding-end: 0;
+}
+
+ion-segment {
+  width: 100%;
+  --background: #ffffff;
+}
+
+ion-segment-button {
+  --indicator-color: rgba(254, 255, 255, 0.97);
+  --color: #000000;
+  --color-checked: #1a65eb;
+  --background-hover: rgba(47, 107, 215, 0.98);
+  --border-width: 0 0 0 0;
+  --indicator-box-shadow: 0 0 0 0;
+}
+
+/*!* Material Design styles *!*/
+/*ion-segment-button.md {*/
+/*  --color: #000;*/
+/*  --color-checked: #1a65eb;*/
+/*  --border-radius: 0px;*/
+/*  --border-width: 0 0 0 0;*/
+/*}*/
+
+/*!* iOS styles *!*/
+/*ion-segment-button.ios {*/
+/*  --color: #000;*/
+/*  --color-checked: #1a65eb;*/
+/*  --border-radius: 0px;*/
+/*  --border-width: 0 0 0 0;*/
+/*}*/
+
+.custom-scroll {
+  overflow-y: auto; /* 显示垂直滚动条 */
+  max-height: 200px; /* 设置最大高度，超出部分会出现滚动条 */
+}
+
+/* 可以根据需要自定义滚动条的样式 */
+.custom-scroll::-webkit-scrollbar {
+  width: 8px;
+}
+
+.custom-scroll::-webkit-scrollbar-thumb {
+  background-color: #888;
+  border-radius: 4px;
+}
+
+.custom-scroll::-webkit-scrollbar-thumb:hover {
+  background-color: #555;
+}
+
+</style>
+
+<template>
+  <ion-button id="open-modal" style="color: #02a6f1;font-size: 15px;" fill="clear" @click="loadProfessionInfo">选择
+  </ion-button>
+  <ion-page>
+    <ion-content class="ion-padding">
+      <ion-modal trigger="open-modal" :backdrop-dismiss="false" :is-open="isOpen" :initial-breakpoint="1"
+                 :breakpoints="[0, 1]">
+        <ion-toolbar>
+          <ion-item>
+            <ion-buttons slot="start">
+              <ion-button fill="clear" @click="onCancel">取消</ion-button>
+            </ion-buttons>
+            <ion-label style="font-size: 12px;white-space: pre-wrap; word-wrap: break-word;">
+              {{ selectProfessionInfo.text }}
+            </ion-label>
+            <ion-buttons slot="end">
+              <ion-button fill="clear" :disabled="selectProfessionInfo.value==''" @click="onConfirm">确定</ion-button>
+            </ion-buttons>
+          </ion-item>
+          <ion-item>
+            <ion-segment value="0">
+              <ion-segment-button v-for="(item,key) in selectModelList" :key="key" @click="onSelectType(item.index)"
+                                  :disabled="item.disabled" :value="item.index">
+                <ion-label :style="{color:item.isSelect?'#1a65eb':'#000000'}">{{ item.name }}</ion-label>
+              </ion-segment-button>
+            </ion-segment>
+          </ion-item>
+        </ion-toolbar>
+        <div class="bw-vue-list">
+          <div class="list-content">
+            <ion-list class="custom-scroll" v-show="selectModelList[selectType.one].isSelect">
+              <ion-item v-for="(item, index) in selectModelList[selectType.one].professionList" :key="index">
+                <ion-label :style="{color:item.isSelect?'#1a65eb':'#000000'}"
+                           @click="onSelect(item,selectType.one)">
+                  {{ item.professionName }}
+                </ion-label>
+              </ion-item>
+            </ion-list>
+            <ion-list class="custom-scroll" v-show="selectModelList[selectType.two].isSelect">
+              <ion-item v-for="(item, index) in selectModelList[selectType.two].professionList" :key="index">
+                <ion-label :style="{color:item.isSelect?'#1a65eb':'#000000'}"
+                           @click="onSelect(item,selectType.two)">
+                  {{ item.professionName }}
+                </ion-label>
+              </ion-item>
+            </ion-list>
+            <ion-list class="custom-scroll" v-show="selectModelList[selectType.three].isSelect">
+              <ion-item v-for="(item, index) in selectModelList[selectType.three].professionList" :key="index">
+                <ion-label :style="{color:item.isSelect?'#1a65eb':'#000000'}"
+                           @click="onSelect(item,selectType.three)">
+                  {{ item.professionName }}
+                </ion-label>
+              </ion-item>
+            </ion-list>
+          </div>
+        </div>
+      </ion-modal>
+    </ion-content>
+  </ion-page>
+</template>
+
+<script lang="ts">
+import {defineComponent, reactive, ref} from 'vue';
+import {getProfessionLevelList} from "@/api/recommendmgt";
+
+export default defineComponent({
+  name: "postSelection",
+  props: {
+    ProfessionID: {type: String, default: ''},
+  },
+  setup(props, context) {
+    const selectType = {
+      one: 0,
+      two: 1,
+      three: 2
+    }
+    const isOpen = ref(false);
+    const selectModelList = reactive([
+      {
+        index: 0,
+        name: '分类一',
+        isSelect: false,
+        disabled: true,
+        professionName: '',
+        professionID: '',
+        professionList: [] as any
+      },
+      {
+        index: 1,
+        name: '分类二',
+        isSelect: false,
+        disabled: true,
+        professionName: '',
+        professionID: '',
+        professionList: [] as any
+      },
+      {
+        index: 2,
+        name: '岗位',
+        isSelect: false,
+        disabled: true,
+        professionName: '',
+        professionID: '',
+        professionList: [] as any
+      }]);
+    const selectProfessionInfo = reactive({value: '', text: ''})
+    const professionLevelList = ref();
+
+    const loadProfessionInfo = () => {
+      getProfessionLevelList().then(data => {
+        professionLevelList.value = data;
+
+        if (!props.ProfessionID) {
+          selectModelList[selectType.one].isSelect = true;
+          selectModelList[selectType.one].disabled = false;
+          selectModelList[selectType.one].professionName = ''
+          selectModelList[selectType.one].professionID = ''
+          selectModelList[selectType.one].professionList = professionLevelList.value.filter((x: any) => x.professionLevel == "1")
+              .map((x: any) => ({
+                ...x,
+                isSelect: false
+              }));
+        } else {
+
+          const threeInfo = professionLevelList.value.find((x: any) => x.professionLevel == "3" && x.professionID == props.ProfessionID);
+          const twoInfo = professionLevelList.value.find((x: any) => x.professionLevel == "2" && x.professionID == threeInfo.parentProfessionID);
+          const oneInfo = professionLevelList.value.find((x: any) => x.professionLevel == "1" && x.professionID == twoInfo.parentProfessionID);
+
+          selectModelList[selectType.one].disabled = false;
+          selectModelList[selectType.one].professionName = oneInfo.professionName;
+          selectModelList[selectType.one].professionID = oneInfo.professionID;
+          selectModelList[selectType.one].professionList = professionLevelList.value.filter((x: any) => x.professionLevel == "1")
+              .map((x: any) => ({
+                ...x,
+                isSelect: false
+              }));
+          selectModelList[selectType.one].professionList.find((x: any) => x.professionID == oneInfo.professionID).isSelect = true;
+
+          selectModelList[selectType.two].disabled = false;
+          selectModelList[selectType.two].professionName = twoInfo.professionName;
+          selectModelList[selectType.two].professionID = twoInfo.professionID;
+          selectModelList[selectType.two].professionList = professionLevelList.value.filter((x: any) => x.professionLevel == "2"
+              && x.parentProfessionID == oneInfo.professionID).map((x: any) => ({
+            ...x,
+            isSelect: false
+          }));
+          selectModelList[selectType.two].professionList.find((x: any) => x.professionID == twoInfo.professionID).isSelect = true;
+
+          selectModelList[selectType.three].isSelect = true;
+          selectModelList[selectType.three].disabled = false;
+          selectModelList[selectType.three].professionName = threeInfo.professionName;
+          selectModelList[selectType.three].professionID = threeInfo.professionID;
+          selectModelList[selectType.three].professionList = professionLevelList.value.filter((x: any) => x.professionLevel == "3"
+              && x.parentProfessionID == twoInfo.professionID).map((x: any) => ({
+            ...x,
+            isSelect: false
+          }));
+          selectModelList[selectType.three].professionList.find((x: any) => x.professionID == threeInfo.professionID).isSelect = true;
+
+          getSelectProsession();
+        }
+      });
+      isOpen.value = true;
+    }
+
+    const onSelectType = (type: number) => {
+      if (selectType.one == type) {
+        selectModelList.map(x => {
+          x.isSelect = false
+          x.disabled = true
+          x.professionName = ''
+          x.professionID = ''
+          x.professionList = []
+        });
+
+        selectModelList[selectType.one].isSelect = true;
+        selectModelList[selectType.one].disabled = false;
+        selectModelList[selectType.one].professionList = professionLevelList.value.filter((x: any) => x.professionLevel == "1")
+            .map((x: any) => ({
+              ...x,
+              isSelect: false
+            }));
+      }
+
+      if (selectType.two == type) {
+        selectModelList[selectType.one].isSelect = false;
+        selectModelList[selectType.three].isSelect = false;
+        selectModelList[selectType.three].professionName = '';
+        selectModelList[selectType.three].professionID = '';
+        selectModelList[selectType.three].professionList = [];
+
+        selectModelList[selectType.two].isSelect = true;
+        selectModelList[selectType.two].disabled = false;
+        selectModelList[selectType.two].professionName = '';
+        selectModelList[selectType.two].professionID = '';
+        selectModelList[selectType.two].professionList = professionLevelList.value.filter((x: any) => x.professionLevel == "2"
+            && x.parentProfessionID == selectModelList[selectType.one].professionID).map((x: any) => ({
+          ...x,
+          isSelect: false
+        }));
+      }
+
+      if (selectType.three == type) {
+        selectModelList[selectType.one].isSelect = false;
+        selectModelList[selectType.two].isSelect = false;
+
+        selectModelList[selectType.three].isSelect = true;
+        selectModelList[selectType.three].disabled = false;
+        selectModelList[selectType.three].professionName = '';
+        selectModelList[selectType.three].professionID = '';
+        selectModelList[selectType.three].professionList = professionLevelList.value.filter((x: any) => x.professionLevel == "3"
+            && x.parentProfessionID == selectModelList[selectType.two].professionID).map((x: any) => ({
+          ...x,
+          isSelect: false
+        }));
+      }
+
+      getSelectProsession();
+    }
+
+    const onSelect = (item: any, type: any) => {
+      selectModelList[type].professionList.forEach((x: any) => {
+        x.isSelect = x.professionID == item.professionID
+      });
+      selectModelList[type].professionName = item.professionName;
+      selectModelList[type].professionID = item.professionID;
+
+      if (type == selectType.one) {
+        onSelectType(selectType.two);
+      }
+      if (type == selectType.two) {
+        onSelectType(selectType.three);
+      }
+
+      getSelectProsession();
+    }
+
+    const getSelectProsession = () => {
+      selectProfessionInfo.text = selectModelList.filter(x => x.professionName != '').map(x => x.professionName).join("-");
+      selectProfessionInfo.value = selectModelList[selectType.three].professionID;
+    }
+
+    const onCancel = () => {
+      isOpen.value = false;
+    }
+
+    const onConfirm = () => {
+      isOpen.value = false;
+      context.emit("SetProfessionID", selectProfessionInfo);
+    }
+    return {
+      isOpen,
+      selectType,
+      selectModelList,
+      selectProfessionInfo,
+      loadProfessionInfo,
+      onSelectType,
+      onSelect,
+      onCancel,
+      onConfirm,
+    };
+  }
+})
+</script>

h5app/src/router/index.ts

@@ -77,10 +77,6 @@ const routes: Array<RouteRecordRaw> = [
                 path: 'tabMain/company/detail',
                 component: () => import('@/views/pages/company/detail.vue')
             },
-            {
-                path: 'tabMain/company/menu',
-                component: () => import('@/views/pages/company/menu.vue')
-            },
             {
                 path: 'tabMain/company/edit',
                 component: () => import('@/views/pages/company/edit.vue')

h5app/src/views/pages/company/detail.vue

@@ -48,12 +48,11 @@
 </template>
 <script lang="ts">
 import {defineComponent, ref, reactive, watch, toRefs} from "vue";
-import {getCompanyById} from "@/api/company";
 import {useRoute, useRouter} from "vue-router";
+import {getCompanyById} from "@/api/company";
 import {onIonViewDidEnter} from "@ionic/vue";
 import {arrowBackOutline} from 'ionicons/icons';
 
-
 interface FormData{
   dataModel:any
 }
@@ -77,27 +76,22 @@ export default defineComponent({
       router.push({path: pathValue, query: {reload:1,id:formData.dataModel.companyID,status:statusValue}});
     };
 
-    const loadData = async (companyID:any)=>{
+    const loadData = async (companyID:any,loginUserID:any)=>{
       loading.value = true;
-      const reqData = await getCompanyById(companyID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+      const reqData = await getCompanyById(companyID,loginUserID);
       formData.dataModel = reqData;
       console.log("dataModel",formData.dataModel);
       loading.value = false;
     };
 
-    const reload = (companyID:any) => {
-      loadData(companyID);
+    const reload = (companyID:any,loginUserID:any) => {
+      loadData(companyID,loginUserID);
     };
 
-    watch(() => route.query, () => {
-      if (route.query.reload) {
-        reload(route.query.id);
-      }
-    });
 
     onIonViewDidEnter(() => {
       if (route.query.reload) {
-        reload(route.query.id)
+        reload(route.query.id,route.query.loginUserID)
       }
     });
 
@@ -112,10 +106,6 @@ export default defineComponent({
       loadData,
       router,
     }
-  },
-  mounted() {
-    const companyID = this.route.query.id;
-    this.loadData(companyID);
   }
 });
 </script>

h5app/src/views/pages/company/edit.vue

@@ -202,11 +202,11 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {defineComponent, ref, reactive, computed, toRefs} from "vue";
 import {chevronDownOutline, chevronUpOutline, arrowBackOutline} from 'ionicons/icons';
-import {getRegionList, getSiteList, getStreeList} from '@/api/company/index';
+import {defineComponent, ref, reactive, computed, toRefs} from "vue";
 import {useRoute,useRouter} from "vue-router";
-import {alertController, IonIcon, onIonViewDidEnter} from "@ionic/vue";
+import {getRegionList, getSiteList, getStreeList} from '@/api/company/index';
+import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useVuelidate} from "@vuelidate/core";
 import {getCompanyById,saveCompanyInfo} from "@/api/company";
 import {required} from "@vuelidate/validators";
@@ -231,7 +231,6 @@ export default defineComponent({
       name:"",
       statusVal: 1
     });
-    const isAdd = ref<any>(true);
     const isShow = ref<any>(false);
     const isLongDate = ref<any>(false);
     const formState = reactive({
@@ -441,14 +440,12 @@ export default defineComponent({
         getStreetListData(formState.dataModel.regionCode);
     }
 
-    const loadData = async (companyID: any,status:any) => {
+    const loadData = async (companyID: any,status:any,loginUserId:any) => {
       curStepData.value.statusVal = status;
-      isAdd.value = companyID == null;
-      const reqData = await getCompanyById(companyID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+      const reqData = await getCompanyById(companyID,loginUserId);
       formState.dataModel = reqData;
       isLongDate.value = formState.dataModel.validDate == "2099-12-31T00:00:00.000+08:00";
       console.log('dataModel',formState.dataModel);
-      console.log('isAdd',isAdd.value);
       if(formState.dataModel.regionCode!=null) getStreetListData(formState.dataModel.regionCode);
     };
 
@@ -458,15 +455,14 @@ export default defineComponent({
       }
     });*/
 
-    const reload = (companyID:any,status:any) => {
-      isAdd.value = true;
+    const reload = (companyID:any,status:any,loginUserId:any) => {
       isShow.value = false;
-      loadData(companyID,status);
+      loadData(companyID,status,loginUserId);
     }
 
     onIonViewDidEnter(() => {
       if (route.query.reload) {
-        reload(route.query.id,route.query.status);
+        reload(route.query.id,route.query.status,route.query.loginUserID);
       }
     });
 

h5app/src/views/pages/company/list.vue

@@ -82,16 +82,15 @@
 </template>
 
 <script lang="ts">
-
+import {buildOutline,trashOutline,arrowBackOutline, addCircleOutline} from 'ionicons/icons';
 import {computed, defineComponent, reactive, ref} from 'vue';
-import dayjs from "dayjs";
 import {useRoute, useRouter} from "vue-router";
-import {arrowBackOutline, ellipse, addCircleOutline} from 'ionicons/icons';
+import {useUserStore} from '@/store/modules/user';
 import {IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import BEmpty from "@/components/empty.vue";
+import {post} from "@/api/common";
 import {getCompanyList} from '@/api/company/index';
-import {chevronForwardOutline,buildOutline,trashOutline} from 'ionicons/icons';
-import {get, post} from "@/api/common";
+import dayjs from "dayjs";
 
 export default defineComponent({
   name: 'CompanyList',
@@ -99,6 +98,7 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const curUserID = ref("");
     const total = ref(10);
     const loading = ref(true);
     const searchParams = reactive({
@@ -116,6 +116,8 @@ export default defineComponent({
 
     const loadData = async function () {
       loading.value = true;
+      const loginUserInfo = useUserStore().getUserInfo;
+      curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       getCompanyList(searchParams).then(data => {
         dataList.value = dataList.value.concat(data.list);
         total.value = data.total;
@@ -140,12 +142,7 @@ export default defineComponent({
       }, 500);
     }
 
-    const onAdd = () => {
-      router.push({path: './edit', query: {reload: 1,id: null,status: 1}});
-    }
-    const onEdit = (companyID: string) => {
-      router.push({path: './edit', query: {reload: 1, id: companyID,status: 1}});
-    }
+
     // 信息弹窗内容
     const infoAlterData = reactive({
       title:"",
@@ -211,7 +208,15 @@ export default defineComponent({
       delLoading.value = value;
     }
     const onDetail = (companyID:string) => {
-      router.push({path: './detail', query: {reload: 1,id: companyID}});
+      router.push({path: './detail', query: {reload: 1,id: companyID,loginUserID:curUserID.value}});
+    }
+
+    const onAdd = () => {
+      router.push({path: './edit', query: {reload: 1,id: null,status: 1,loginUserID:curUserID.value}});
+    }
+
+    const onEdit = (companyID: string) => {
+      router.push({path: './edit', query: {reload: 1, id: companyID,status: 1,loginUserID:curUserID.value}});
     }
 
     const onBack = () => {
@@ -223,10 +228,8 @@ export default defineComponent({
     });
 
     return {
-      ellipse,
       arrowBackOutline,
       addCircleOutline,
-      chevronForwardOutline,
       buildOutline,
       trashOutline,
       router,

h5app/src/views/pages/company/menu.vue

@@ -1,232 +0,0 @@
-<template>
-  <ion-page>
-    <ion-header class="header-theme2">
-      <ion-toolbar>
-        <ion-buttons slot="start">
-          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
-        </ion-buttons>
-        <ion-title>
-          企业信息收集
-        </ion-title>
-      </ion-toolbar>
-    </ion-header>
-    <ion-content>
-      <div class="stepFlex">
-        <div v-for="(record,key) in stepList" :key="key" class="stepFlex-item">
-          <div
-              :class="[(record.val < curStepData?.statusVal || curStepData?.statusVal == stepList[stepList.length-1].val) ? 'greenCircle' :record.val == curStepData?.statusVal ? 'now' : 'grayCircle']"></div>
-          <div v-if="key !== stepList.length - 1"
-               :class="[record.val < curStepData?.statusVal ? 'greenLine' : 'grayLine']"></div>
-          <div class="stepFlex-item-label">
-            <p class="stepFlex-item-label-title">{{ record.title }}</p>
-            <p class="stepFlex-item-label-desc">{{ record.desc }}</p>
-          </div>
-        </div>
-      </div>
-      <div>
-        <ion-label style="text-align: center;color:#46b0e0;">
-          <h2 style="font-size: 28px;">
-            {{ dataModel.companyName == null?"":dataModel.companyName }}
-          </h2>
-        </ion-label>
-      </div>
-      <ion-grid>
-        <ion-row class="ion-justify-content-center">
-          <ion-col size="4">
-            <ion-button expand="block" style="display: inline-block; width: 120px;height:45px;font-size: 20px;" @click="onPathForward('./edit',1)">信息维护</ion-button>
-          </ion-col>
-          <ion-col size="4" >
-            <ion-button expand="block" style="display: inline-block; width: 120px;height:45px;font-size: 20px;" @click="onPathForward('./postList',3)">岗位管理</ion-button>
-          </ion-col>
-        </ion-row>
-      </ion-grid>
-    </ion-content>
-    <ion-footer>
-    </ion-footer>
-  </ion-page>
-</template>
-<script lang="ts">
-import {defineComponent, ref, reactive, watch, toRefs} from "vue";
-import {getCompanyById} from "@/api/company";
-import {useRoute, useRouter} from "vue-router";
-import {onIonViewDidEnter} from "@ionic/vue";
-import {arrowBackOutline} from 'ionicons/icons';
-
-interface StepParams{
-  name: string,
-  statusVal: number
-}
-
-interface FormData{
-  dataModel:any
-}
-export default defineComponent({
-  name: 'CompanyMenu',
-  setup() {
-    const router = useRouter();
-    const route = useRoute();
-    const curStepData = ref<StepParams>({
-      name:"",
-      statusVal: 1
-    });
-    const loading = ref<boolean>(false);
-    const formData = reactive<FormData>({
-      dataModel: {
-        companyID:null,
-        companyName:null
-      }
-    });
-    const stepList = ref([
-        {title: '基础信息', desc: '企业基础信息', val: 1},
-        {title: '', desc: '', val: 2},
-        {title: '岗位信息', desc: '企业岗位信息', val: 3}
-    ]);
-
-    const onBack=()=>{
-      router.push({path:'./list',query:{reload:1}});
-    };
-
-    const onPathForward = (pathValue:string,statusValue:any)=>{
-      router.push({path: pathValue, query: {reload:1,id:formData.dataModel.companyID,status:statusValue}});
-    };
-
-    const loadData = async (companyID:any,status:any)=>{
-      loading.value = true;
-      curStepData.value.statusVal = status;
-      console.log(companyID);
-      const reqData = await getCompanyById(companyID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
-      formData.dataModel = reqData;
-      console.log("dataModel",formData.dataModel);
-      loading.value = false;
-    };
-
-    const reload = (companyID:any,status:any) => {
-      loadData(companyID,status);
-    };
-
-    watch(() => route.query, () => {
-      if (route.query.reload) {
-        reload(route.query.id,route.query.status);
-      }
-    });
-
-    onIonViewDidEnter(() => {
-      if (route.query.reload) {
-        reload(route.query.id,route.query.status)
-      }
-    });
-
-
-    return {
-      ...toRefs(formData),
-      arrowBackOutline,
-      route,
-      loading,
-      stepList,
-      curStepData,
-      onPathForward,
-      onBack,
-      loadData,
-      router,
-    }
-  },
-  mounted() {
-    const companyID = this.route.query.id;
-    const status = this.route.query.status;
-    this.loadData(companyID,status);
-  }
-});
-</script>
-
-<style lang="less">
-ion-item {
-  --border-width: 0;
-  --border-style: none;
-
-  ion-label, ion-input, ion-select, ion-datetime-button {
-    font-size: 14px !important;
-  }
-}
-
-.stepFlex {
-  margin: 0;
-  display: flex;
-  width: 100%;
-
-  .stepFlex-item {
-    position: relative;
-    flex: 1;
-    text-align: center;
-    margin-top: -10px;
-
-    .stepFlex-item-label {
-      padding-top: 60px;
-      font-size: 14px;
-
-      .stepFlex-item-label-title {
-        margin-top: 30px;
-      }
-
-      .stepFlex-item-label-desc {
-        margin-top: 5px;
-        color: #b9b9bd;
-      }
-    }
-  }
-
-  .greenCircle {
-    top: calc(50% - 15px);
-    left: calc(50% - 4px);
-    position: absolute;
-    z-index: 2;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: #31A2FE;
-  }
-
-  .now {
-    top: calc(50% - 18px);
-    left: calc(50% - 8px);
-    position: absolute;
-    z-index: 3;
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background-color: #31A2FE;
-    border: 4px solid #c5e8f9;
-  }
-
-  .grayCircle {
-    top: calc(50% - 15px);
-    left: calc(50% - 4px);
-    position: absolute;
-    z-index: 2;
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: #ccc;
-  }
-
-  .greenLine {
-    width: 100%;
-    top: calc(50% - 11px);
-    left: calc(50% - 2px);
-    height: 2px;
-    background-color: #31A2FE;
-    position: absolute;
-  }
-
-  .grayLine {
-    height: 0;
-    border: 1px dashed #ccc;
-    width: 100%;
-    top: calc(50% - 11px);
-    left: calc(50% - 2px);
-    position: absolute;
-  }
-
-}
-
-
-</style>

h5app/src/views/pages/jobhunt/detail.vue

@@ -43,7 +43,7 @@
   </ion-page>
 </template>
 <script lang="ts">
-import {defineComponent, ref, reactive, watch, toRefs} from "vue";
+import {defineComponent, ref, reactive, toRefs} from "vue";
 import {getJobUserById} from "@/api/jobUserInfo";
 import {useRoute, useRouter} from "vue-router";
 import {onIonViewDidEnter} from "@ionic/vue";
@@ -67,28 +67,21 @@ export default defineComponent({
       router.push({path:'./list',query:{reload:1}});
     };
 
-
-    const loadData = async (jobUserID:any)=>{
+    const loadData = async (jobUserID:any,loginUserId:any)=>{
       loading.value = true;
-      const reqData = await getJobUserById(jobUserID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+      const reqData = await getJobUserById(jobUserID,loginUserId);
       formData.dataModel = reqData;
       console.log("dataModel",formData.dataModel);
       loading.value = false;
     };
 
-    const reload = (jobUserID:any) => {
-      loadData(jobUserID);
+    const reload = (jobUserID:any,loginUserID:any) => {
+      loadData(jobUserID,loginUserID);
     };
 
-    watch(() => route.query, () => {
-      if (route.query.reload) {
-        reload(route.query.id);
-      }
-    });
-
     onIonViewDidEnter(() => {
       if (route.query.reload) {
-        reload(route.query.id)
+        reload(route.query.id,route.query.loginUserID)
       }
     });
 
@@ -102,10 +95,6 @@ export default defineComponent({
       loadData,
       router,
     }
-  },
-  mounted() {
-    const companyID = this.route.query.id;
-    this.loadData(companyID);
   }
 });
 </script>

h5app/src/views/pages/jobhunt/edit.vue

@@ -381,6 +381,7 @@
 <script lang="ts">
 import {chevronDownOutline, chevronUpOutline,arrowBackOutline,addCircleOutline,trashOutline} from 'ionicons/icons';
 import {reactive,defineComponent, computed,watch,ref,toRefs} from "vue";
+import {post} from "@/api/common";
 import {useRoute, useRouter} from "vue-router";
 import {required} from "@vuelidate/validators";
 import {useVuelidate} from "@vuelidate/core";
@@ -393,7 +394,7 @@ import {getSiteDataList} from "@/api/siteInfo";
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import dayjs from "dayjs";
-import {post} from "@/api/common";
+import {useUserStore} from "@/store/modules/user";
 
 interface SelectProps {
   name: string,
@@ -408,6 +409,8 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const loginUserInfo = useUserStore().getUserInfo;
+    const curUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
     const isAllowCommit = ref(true);
     const expand = ref<boolean>(false);
     const loading = ref(true);
@@ -708,30 +711,30 @@ export default defineComponent({
       pageParams.jobUserID = jobUserID;
       baseInfoData.baseData.jobUserID = jobUserID;
       curStepData.value.statusVal = status;
-      console.log("当前jobUserID",jobUserID);
+      //console.log("当前jobUserID",jobUserID);
       if(curStepData.value.statusVal==1){
-        const reqData = await getJobUserById(jobUserID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+        const reqData = await getJobUserById(jobUserID,curUserID);
         baseInfoData.baseData = reqData;
-        console.log('baseData',baseInfoData.baseData);
+        //console.log('baseData',baseInfoData.baseData);
         await getStreetList();
       }
       else if(curStepData.value.statusVal==2){
         const reqData :any = await getEducationListByJobUserID(pageParams);
         educationList.value = reqData.list;
         pageParams.total = reqData.total;
-        console.log("educationList",educationList.value);
+        //console.log("educationList",educationList.value);
       }
       else if(curStepData.value.statusVal==3){
         const reqData = await getExperienceListByJobUserID(pageParams);
         experienceList.value= reqData.list;
         pageParams.total = reqData.total;
-        console.log("experienceList",experienceList.value);
+        //console.log("experienceList",experienceList.value);
       }
       else if(curStepData.value.statusVal==4){
         const reqData = await getJobHuntListByJobUserID(pageParams);
         jobHuntList.value= reqData.list;
         pageParams.total = reqData.total;
-        console.log("jobHuntList",jobHuntList.value);
+        //console.log("jobHuntList",jobHuntList.value);
       }
       loading.value = false;
     };

h5app/src/views/pages/jobhunt/list.vue

@@ -82,20 +82,21 @@
 </template>
 
 <script lang="ts">
+import {arrowBackOutline,addCircleOutline,chevronForwardOutline,buildOutline,trashOutline} from 'ionicons/icons';
 import {useRouter} from "vue-router";
 import {computed, defineComponent, reactive, ref} from 'vue';
-import {arrowBackOutline,addCircleOutline} from 'ionicons/icons';
-import {chevronForwardOutline,buildOutline,trashOutline} from 'ionicons/icons';
 import {IonIcon, onIonViewDidEnter} from '@ionic/vue';
 import {getJobUserList} from "@/api/jobUserInfo";
 import {getJobHuntListByJobUserID} from "@/api/jobHuntInfo";
 import {post} from "@/api/common";
+import {useUserStore} from "@/store/modules/user";
 
 export default defineComponent({
   name: 'jobUserList',
   components: {IonIcon},
   setup() {
     const router = useRouter();
+    const curUserID = ref("");
     const total = ref(10);
     const loading = ref(true);
     const pagination = computed(() => ({
@@ -129,6 +130,8 @@ export default defineComponent({
     }
     const loadData = async function () {
       loading.value = true;
+      const loginUserInfo = useUserStore().getUserInfo;
+      curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       getJobUserList(searchParams).then(data=>{
         dataList.value = dataList.value.concat(data.list);
         (dataList.value as any[]).map(item=>{
@@ -161,9 +164,7 @@ export default defineComponent({
       }, 500);
     }
 
-    const onAdd = () => {
-      router.push({path: './edit', query: {reload:1,jobUserID:null,status:1}});
-    }
+
 
     const onBack =()=>{
       router.push('../');
@@ -233,11 +234,14 @@ export default defineComponent({
       delLoading.value = value;
     }
     const onDetail = (jobUserID: string) => {
-      router.push({path: './detail', query: {reload: 1, id: jobUserID}});
+      router.push({path: './detail', query: {reload: 1, id: jobUserID,loginUserID:curUserID.value}});
     }
     const onEdit = (jobUserID:string) =>{
       router.push({path: './edit', query: {reload:1,jobUserID: jobUserID,status: 1}});
     }
+    const onAdd = () => {
+      router.push({path: './edit', query: {reload:1,jobUserID:null,status:1}});
+    }
 
     onIonViewDidEnter(() => {
       reload();

h5app/src/views/pages/jobhunt/recommend/list.vue

@@ -193,34 +193,3 @@ export default defineComponent({
   }
 });
 </script>
-
-<style lang="less">
-.custom{
-  --placeholder-color: gray;
-  --placeholder-opacity: 0.5;
-}
-
-.recommend-list-page {
-  .list-content {
-    margin: 0px 15px !important;
-    background-color: white !important;
-    border-radius: 0 !important;
-
-    ion-item {
-      margin-top: 10px;
-      font-size: 14px;
-      border: 1px solid rgb(242, 242, 245);
-
-      p {
-        font-size: 12px;
-      }
-    }
-  }
-}
-
-.container {
-  display: flex;
-  justify-content: center; /* 水平居中 */
-  align-items: center; /* 垂直居中 */
-}
-</style>

h5app/src/views/pages/post/detail.vue

@@ -93,12 +93,13 @@
 </template>
 <script lang="ts">
 import {arrowBackOutline,addCircleOutline} from 'ionicons/icons';
-import {reactive,defineComponent,watch,ref,toRefs} from "vue";
+import {reactive,defineComponent,ref} from "vue";
 import {useRoute, useRouter} from "vue-router";
 import {getJobUserById,getUserHuntList} from "@/api/jobUserInfo";
 import {getCommendPostList,saveCommendPost,saveCommendPostList} from "@/api/post";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import dayjs from "dayjs";
+import {useUserStore} from "@/store/modules/user";
 
 interface SelectProps {
   name: string,
@@ -132,6 +133,7 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const curUserID = ref("");
     const editForm = ref();
     const commendStr = ref("推荐");
     const dataModel = ref<UserInfoModel>({
@@ -240,7 +242,9 @@ export default defineComponent({
       formStatus.loading = true;
       recommendPostList.value = [];
       /*查询求职人员信息*/
-      const userInfo :any = await getJobUserById(jobUserID,"60ea0d5b-a75c-11ed-a6c5-7085c2a9999e");
+      const loginUserInfo = useUserStore().getUserInfo;
+      curUserID.value = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
+      const userInfo :any = await getJobUserById(jobUserID,curUserID.value);
       dataModel.value = userInfo;
       /*查询求职意向信息*/
       await getCurHuntList(jobUserID);
@@ -252,11 +256,6 @@ export default defineComponent({
       formStatus.loading = false;
     };
 
-    watch(() => route.query, () => {
-      if (route.query.reload) {
-        loadData(route.query.jobUserID);
-      }
-    });
 
     const reload = (jobUserID:any) => {
       pageParams.pageIndex = 1;

h5app/src/views/pages/post/edit.vue

@@ -31,9 +31,10 @@
             <ion-label>岗位名称<span class="danger">*</span></ion-label>
             <ion-item :class="[v$.dataModel.professionName.$error?'ion-invalid':'ion-valid']">
               <ion-input placeholder="请选择岗位" label-placement="stacked" :clear-input="true"
-                        v-model="dataModel.professionName" class="custom">
+                         v-model="dataModel.professionName" class="custom">
               </ion-input>
-              <picker :ProfessionID="dataModel.professionID" aria-disabled="false"  @SetProfessionID="onSetProfessionID"></picker>
+<!--              <picker :ProfessionID="dataModel.professionID" aria-disabled="false"  @SetProfessionID="onSetProfessionID"></picker>-->
+              <post-selection :ProfessionID="dataModel.professionID" @SetProfessionID="onSetProfessionID"></post-selection>
               <ion-note slot="error">请选择岗位</ion-note>
             </ion-item>
           </div>
@@ -194,18 +195,16 @@ import {useRoute, useRouter} from "vue-router";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useVuelidate} from "@vuelidate/core";
 import {getPostByID, savePost} from "@/api/post";
-import {minLength, required} from "@vuelidate/validators";
+import { required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import {getCompanyBySiteID} from "@/api/company";
 import {useUserStore} from '@/store/modules/user';
 import dayjs from "dayjs";
-import Picker from "@/components/picker.vue";
+import PostSelection from "@/components/postSelection.vue";
 
 export default defineComponent({
   name: 'PostEdit',
-  components:{
-    Picker
-  },
+  components:{PostSelection},
   setup() {
     const router = useRouter();
     const route = useRoute();

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -72,20 +72,20 @@ public class CompanyController {
             data = new CompanyVo();
             data.companyID = UUID.randomUUID().toString();
             data.recordStatus = 1;
-            data.validDate = dateUtils.StrToDate("2099-12-31 00:00:00") ;
+            data.validDate = dateUtils.StrToDate("2099-12-31 00:00:00");
             data.isShortage = 1;
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
             PcSiteUserExample.Criteria siteUserCro = siteUserExp.createCriteria();
             siteUserCro.andUserIDEqualTo(loginUserID);
             //siteUserCro.andUserIDEqualTo(accountService.getLoginUserID());
             var curSiteUserInfo = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
-            if(curSiteUserInfo != null){
+            if (curSiteUserInfo != null) {
                 data.setSiteID(curSiteUserInfo.getSiteID());
                 PcSiteExample siteExp = new PcSiteExample();
                 PcSiteExample.Criteria siteCro = siteExp.createCriteria();
                 siteCro.andSiteIDEqualTo(curSiteUserInfo.getSiteID());
                 var curSiteInfo = pcSiteMapper.selectByExample(siteExp).stream().findFirst().orElse(null);
-                if(curSiteInfo != null){
+                if (curSiteInfo != null) {
                     data.setRegionCode(curSiteInfo.getRegionCode());
                     data.setStreetCode(curSiteInfo.getStreetCode());
                 }

src/main/java/com/hz/employmentsite/model/PcCompany.java

@@ -53,6 +53,22 @@ public class PcCompany {
 
     private String openId;
 
+    private Date establishmentTime;
+
+    private String signInPoliticalArea;
+
+    private String website;
+
+    private String bonus;
+
+    private Integer registeredCapital;
+
+    private Integer professionID;
+
+    private Integer estateCategoryID;
+
+    private Integer tagID;
+
     public String getCompanyID() {
         return companyID;
     }
@@ -252,4 +268,68 @@ public class PcCompany {
     public void setOpenId(String openId) {
         this.openId = openId == null ? null : openId.trim();
     }
+
+    public Date getEstablishmentTime() {
+        return establishmentTime;
+    }
+
+    public void setEstablishmentTime(Date establishmentTime) {
+        this.establishmentTime = establishmentTime;
+    }
+
+    public String getSignInPoliticalArea() {
+        return signInPoliticalArea;
+    }
+
+    public void setSignInPoliticalArea(String signInPoliticalArea) {
+        this.signInPoliticalArea = signInPoliticalArea;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getBonus() {
+        return bonus;
+    }
+
+    public void setBonus(String bonus) {
+        this.bonus = bonus;
+    }
+
+    public Integer getRegisteredCapital() {
+        return registeredCapital;
+    }
+
+    public void setRegisteredCapital(Integer registeredCapital) {
+        this.registeredCapital = registeredCapital;
+    }
+
+    public Integer getProfessionID() {
+        return professionID;
+    }
+
+    public void setProfessionID(Integer professionID) {
+        this.professionID = professionID;
+    }
+
+    public Integer getEstateCategoryID() {
+        return estateCategoryID;
+    }
+
+    public void setEstateCategoryID(Integer estateCategoryID) {
+        this.estateCategoryID = estateCategoryID;
+    }
+
+    public Integer getTagID() {
+        return tagID;
+    }
+
+    public void setTagID(Integer tagID) {
+        this.tagID = tagID;
+    }
 }

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -134,6 +134,14 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setCreateUserID(userId);
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
+            dbData.setEstablishmentTime(data.getEstablishmentTime());
+            dbData.setRegisteredCapital(data.getRegisteredCapital());
+            dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
+            dbData.setWebsite(data.getWebsite());
+            dbData.setBonus(data.getBonus());
+            dbData.setProfessionID(data.getProfessionID());
+            dbData.setEstateCategoryID(data.getEstateCategoryID());
+            dbData.setTagID(data.getTagID());
             result = pcCompanyMapper.insert(dbData);
 
         } else {
@@ -160,6 +168,14 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setLatitude(data.getLatitude());
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
+            dbData.setEstablishmentTime(data.getEstablishmentTime());
+            dbData.setRegisteredCapital(data.getRegisteredCapital());
+            dbData.setSignInPoliticalArea(data.getSignInPoliticalArea());
+            dbData.setWebsite(data.getWebsite());
+            dbData.setBonus(data.getBonus());
+            dbData.setProfessionID(data.getProfessionID());
+            dbData.setEstateCategoryID(data.getEstateCategoryID());
+            dbData.setTagID(data.getTagID());
             result = pcCompanyMapper.updateByPrimaryKeySelective(dbData);
         }
         return result;

src/main/java/com/hz/employmentsite/vo/companyService/CompanyVo.java

@@ -1,10 +1,11 @@
 package com.hz.employmentsite.vo.companyService;
 
+import com.hz.employmentsite.util.datarange.annotations.CompanyID;
 import com.hz.employmentsite.util.datarange.annotations.InstitutionID;
 import com.hz.employmentsite.util.datarange.annotations.RegionID;
 import com.hz.employmentsite.util.datarange.annotations.SiteID;
 import lombok.Data;
-import com.hz.employmentsite.util.datarange.annotations.CompanyID;
+
 import java.util.Date;
 
 @Data
@@ -77,13 +78,26 @@ public class CompanyVo {
     public String longitude;
     public String latitude;
 
+    public Date establishmentTime;
+    public Integer registeredCapital;
+    public String signInPoliticalArea;
+
+    public Integer professionID;
+    public String professionName;
+    public Integer estateCategoryID;
+    public String estateCategoryName;
+    public Integer tagID;
+    public String tagName;
+
+    public String website;
+    public String bonus;
 
     public String errorMessage;
 
     public Integer insuredCount;
 
     public Integer isShortage;
-    public String  isShortageName;
+    public String isShortageName;
     @InstitutionID
     public String institutionID;
 

src/main/resources/mapping/PcCompanyMapper.xml

@@ -2,31 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.PcCompanyMapper">
   <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcCompany">
-    <id column="CompanyID" jdbcType="VARCHAR" property="companyID" />
-    <result column="SiteID" jdbcType="VARCHAR" property="siteID" />
-    <result column="RegionCode" jdbcType="VARCHAR" property="regionCode" />
-    <result column="InsuredCount" jdbcType="INTEGER" property="insuredCount" />
-    <result column="StreetCode" jdbcType="VARCHAR" property="streetCode" />
-    <result column="CompanyName" jdbcType="VARCHAR" property="companyName" />
-    <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode" />
-    <result column="CompanyModel" jdbcType="INTEGER" property="companyModel" />
-    <result column="WorkSituation" jdbcType="VARCHAR" property="workSituation" />
-    <result column="CompanyType" jdbcType="INTEGER" property="companyType" />
-    <result column="CompanyAddress" jdbcType="VARCHAR" property="companyAddress" />
-    <result column="UserName" jdbcType="VARCHAR" property="userName" />
-    <result column="UserMobile" jdbcType="VARCHAR" property="userMobile" />
-    <result column="CompanyEmail" jdbcType="VARCHAR" property="companyEmail" />
-    <result column="FrName" jdbcType="VARCHAR" property="frName" />
-    <result column="ValidDate" jdbcType="TIMESTAMP" property="validDate" />
-    <result column="IsShortage" jdbcType="INTEGER" property="isShortage" />
-    <result column="RecordStatus" jdbcType="INTEGER" property="recordStatus" />
-    <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
-    <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
-    <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
-    <result column="Longitude" jdbcType="VARCHAR" property="longitude" />
-    <result column="Latitude" jdbcType="VARCHAR" property="latitude" />
-    <result column="openId" jdbcType="VARCHAR" property="openId" />
+    <id column="CompanyID" jdbcType="VARCHAR" property="companyID"/>
+    <result column="SiteID" jdbcType="VARCHAR" property="siteID"/>
+    <result column="RegionCode" jdbcType="VARCHAR" property="regionCode"/>
+    <result column="InsuredCount" jdbcType="INTEGER" property="insuredCount"/>
+    <result column="StreetCode" jdbcType="VARCHAR" property="streetCode"/>
+    <result column="CompanyName" jdbcType="VARCHAR" property="companyName"/>
+    <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode"/>
+    <result column="CompanyModel" jdbcType="INTEGER" property="companyModel"/>
+    <result column="WorkSituation" jdbcType="VARCHAR" property="workSituation"/>
+    <result column="CompanyType" jdbcType="INTEGER" property="companyType"/>
+    <result column="CompanyAddress" jdbcType="VARCHAR" property="companyAddress"/>
+    <result column="UserName" jdbcType="VARCHAR" property="userName"/>
+    <result column="UserMobile" jdbcType="VARCHAR" property="userMobile"/>
+    <result column="CompanyEmail" jdbcType="VARCHAR" property="companyEmail"/>
+    <result column="FrName" jdbcType="VARCHAR" property="frName"/>
+    <result column="ValidDate" jdbcType="TIMESTAMP" property="validDate"/>
+    <result column="IsShortage" jdbcType="INTEGER" property="isShortage"/>
+    <result column="RecordStatus" jdbcType="INTEGER" property="recordStatus"/>
+    <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID"/>
+    <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime"/>
+    <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID"/>
+    <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime"/>
+    <result column="Longitude" jdbcType="VARCHAR" property="longitude"/>
+    <result column="Latitude" jdbcType="VARCHAR" property="latitude"/>
+    <result column="EstablishmentTime" jdbcType="TIMESTAMP" property="establishmentTime"/>
+    <result column="SignInPoliticalArea" jdbcType="VARCHAR" property="signInPoliticalArea"/>
+    <result column="Website" jdbcType="VARCHAR" property="website"/>
+    <result column="Bonus" jdbcType="VARCHAR" property="bonus"/>
+    <result column="RegisteredCapital" jdbcType="INTEGER" property="registeredCapital"/>
+    <result column="ProfessionID" jdbcType="INTEGER" property="professionID"/>
+    <result column="EstateCategoryID" jdbcType="INTEGER" property="estateCategoryID"/>
+    <result column="TagID" jdbcType="INTEGER" property="tagID"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     <result column="BusinScope" jdbcType="LONGVARCHAR" property="businScope" />
@@ -91,10 +98,11 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    CompanyID, SiteID, RegionCode, InsuredCount, StreetCode, CompanyName, CompanyCode, 
-    CompanyModel, WorkSituation, CompanyType, CompanyAddress, UserName, UserMobile, CompanyEmail, 
-    FrName, ValidDate, IsShortage, RecordStatus, CreateUserID, CreateTime, ModifyUserID, 
-    ModifyTime, Longitude, Latitude, openId
+    CompanyID
+    , SiteID, RegionCode, InsuredCount, StreetCode, CompanyName, CompanyCode,
+    CompanyModel, WorkSituation, CompanyType, CompanyAddress, UserName, UserMobile, CompanyEmail,
+    FrName, ValidDate, IsShortage, RecordStatus, CreateUserID, CreateTime, ModifyUserID,
+    ModifyTime, Longitude, Latitude, EstablishmentTime,SignInPoliticalArea,Website,Bonus,RegisteredCapital,ProfessionID,EstateCategoryID,TagID
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -130,7 +138,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select 
+    select
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
@@ -148,26 +156,31 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
-    insert into pc_company (CompanyID, SiteID, RegionCode, 
-      InsuredCount, StreetCode, CompanyName, 
-      CompanyCode, CompanyModel, WorkSituation, 
-      CompanyType, CompanyAddress, UserName, 
-      UserMobile, CompanyEmail, FrName, 
-      ValidDate, IsShortage, RecordStatus, 
-      CreateUserID, CreateTime, ModifyUserID, 
-      ModifyTime, Longitude, Latitude, 
-      openId, BusinScope, CompanyDesc
-      )
-    values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR}, 
-      #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{companyCode,jdbcType=VARCHAR}, #{companyModel,jdbcType=INTEGER}, #{workSituation,jdbcType=VARCHAR}, 
-      #{companyType,jdbcType=INTEGER}, #{companyAddress,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
-      #{userMobile,jdbcType=VARCHAR}, #{companyEmail,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR}, 
-      #{validDate,jdbcType=TIMESTAMP}, #{isShortage,jdbcType=INTEGER}, #{recordStatus,jdbcType=INTEGER}, 
-      #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, 
-      #{modifyTime,jdbcType=TIMESTAMP}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
-      #{openId,jdbcType=VARCHAR}, #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR}
-      )
+    insert into pc_company (CompanyID, SiteID, RegionCode,
+                            InsuredCount, StreetCode, CompanyName,
+                            CompanyCode, CompanyModel, WorkSituation,
+                            CompanyType, CompanyAddress, UserName,
+                            UserMobile, CompanyEmail, FrName,
+                            ValidDate, IsShortage, RecordStatus,
+                            CreateUserID, CreateTime, ModifyUserID,
+                            ModifyTime, Longitude, Latitude,
+                            openId, BusinScope, CompanyDesc,
+                            EstablishmentTime, RegisteredCapital, SignInPoliticalArea,
+                            ProfessionID, EstateCategoryID, TagID,
+                            Website, Bonus)
+    values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR},
+            #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
+            #{companyCode,jdbcType=VARCHAR}, #{companyModel,jdbcType=INTEGER}, #{workSituation,jdbcType=VARCHAR},
+            #{companyType,jdbcType=INTEGER}, #{companyAddress,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
+            #{userMobile,jdbcType=VARCHAR}, #{companyEmail,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR},
+            #{validDate,jdbcType=TIMESTAMP}, #{isShortage,jdbcType=INTEGER}, #{recordStatus,jdbcType=INTEGER},
+            #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR},
+            #{modifyTime,jdbcType=TIMESTAMP}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR},
+            #{openId,jdbcType=VARCHAR}, #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR},
+            #{establishmentTime,jdbcType=TIMESTAMP}, #{registeredCapital,jdbcType=INTEGER},
+            #{signInPoliticalArea,jdbcType=VARCHAR}, #{professionID,jdbcType=INTEGER},
+            #{estateCategoryID,jdbcType=INTEGER},
+            #{tagID,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{bonus,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     insert into pc_company
@@ -253,6 +266,30 @@
       <if test="companyDesc != null">
         CompanyDesc,
       </if>
+      <if test="establishmentTime != null">
+        establishmentTime,
+      </if>
+      <if test="signInPoliticalArea != null">
+        signInPoliticalArea,
+      </if>
+      <if test="website != null">
+        website,
+      </if>
+      <if test="bonus != null">
+        bonus,
+      </if>
+      <if test="registeredCapital != null">
+        registeredCapital,
+      </if>
+      <if test="professionID != null">
+        professionID,
+      </if>
+      <if test="estateCategoryID != null">
+        estateCategoryID,
+      </if>
+      <if test="tagID != null">
+        tagID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="companyID != null">
@@ -336,6 +373,30 @@
       <if test="companyDesc != null">
         #{companyDesc,jdbcType=LONGVARCHAR},
       </if>
+      <if test="establishmentTime != null">
+        #{establishmentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="signInPoliticalArea != null">
+        #{signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="website != null">
+        #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="bonus != null">
+        #{bonus,jdbcType=VARCHAR},
+      </if>
+      <if test="registeredCapital != null">
+        #{registeredCapital,jdbcType=INTEGER},
+      </if>
+      <if test="professionID != null">
+        #{professionID,jdbcType=INTEGER},
+      </if>
+      <if test="estateCategoryID != null">
+        #{estateCategoryID,jdbcType=INTEGER},
+      </if>
+      <if test="tagID != null">
+        #{tagID,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hz.employmentsite.model.PcCompanyExample" resultType="java.lang.Long">
@@ -428,6 +489,30 @@
       <if test="row.companyDesc != null">
         CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR},
       </if>
+      <if test="row.establishmentTime != null">
+        EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="row.signInPoliticalArea != null">
+        SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="row.website != null">
+        Website = #{row.website,jdbcType=VARCHAR},
+      </if>
+      <if test="row.bonus != null">
+        Bonus = #{row.bonus,jdbcType=VARCHAR},
+      </if>
+      <if test="row.registeredCapital != null">
+        RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
+      </if>
+      <if test="row.professionID != null">
+        ProfessionID = #{row.professionID,jdbcType=INTEGER},
+      </if>
+      <if test="row.estateCategoryID != null">
+        EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
+      </if>
+      <if test="row.tagID != null">
+        TagID = #{row.tagID,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -436,32 +521,40 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update pc_company
     set CompanyID = #{row.companyID,jdbcType=VARCHAR},
-      SiteID = #{row.siteID,jdbcType=VARCHAR},
-      RegionCode = #{row.regionCode,jdbcType=VARCHAR},
-      InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
-      StreetCode = #{row.streetCode,jdbcType=VARCHAR},
-      CompanyName = #{row.companyName,jdbcType=VARCHAR},
-      CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{row.companyModel,jdbcType=INTEGER},
-      WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
-      CompanyType = #{row.companyType,jdbcType=INTEGER},
-      CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
-      UserName = #{row.userName,jdbcType=VARCHAR},
-      UserMobile = #{row.userMobile,jdbcType=VARCHAR},
-      CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
-      FrName = #{row.frName,jdbcType=VARCHAR},
-      ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
-      IsShortage = #{row.isShortage,jdbcType=INTEGER},
-      RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
-      CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
-      CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      Longitude = #{row.longitude,jdbcType=VARCHAR},
-      Latitude = #{row.latitude,jdbcType=VARCHAR},
-      openId = #{row.openId,jdbcType=VARCHAR},
-      BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
-      CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR}
+    SiteID = #{row.siteID,jdbcType=VARCHAR},
+    RegionCode = #{row.regionCode,jdbcType=VARCHAR},
+    InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
+    StreetCode = #{row.streetCode,jdbcType=VARCHAR},
+    CompanyName = #{row.companyName,jdbcType=VARCHAR},
+    CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
+    CompanyModel = #{row.companyModel,jdbcType=INTEGER},
+    WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
+    CompanyType = #{row.companyType,jdbcType=INTEGER},
+    CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
+    UserName = #{row.userName,jdbcType=VARCHAR},
+    UserMobile = #{row.userMobile,jdbcType=VARCHAR},
+    CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
+    FrName = #{row.frName,jdbcType=VARCHAR},
+    ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+    IsShortage = #{row.isShortage,jdbcType=INTEGER},
+    RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
+    CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
+    CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
+    ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+    ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+    Longitude = #{row.longitude,jdbcType=VARCHAR},
+    Latitude = #{row.latitude,jdbcType=VARCHAR},
+    openId = #{row.openId,jdbcType=VARCHAR},
+    BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
+    CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR},
+    EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
+    SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+    Website = #{row.website,jdbcType=VARCHAR},
+    Bonus = #{row.bonus,jdbcType=VARCHAR},
+    RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
+    ProfessionID = #{row.professionID,jdbcType=INTEGER},
+    EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
+    TagID = #{row.tagID,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -469,30 +562,38 @@
   <update id="updateByExample" parameterType="map">
     update pc_company
     set CompanyID = #{row.companyID,jdbcType=VARCHAR},
-      SiteID = #{row.siteID,jdbcType=VARCHAR},
-      RegionCode = #{row.regionCode,jdbcType=VARCHAR},
-      InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
-      StreetCode = #{row.streetCode,jdbcType=VARCHAR},
-      CompanyName = #{row.companyName,jdbcType=VARCHAR},
-      CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{row.companyModel,jdbcType=INTEGER},
-      WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
-      CompanyType = #{row.companyType,jdbcType=INTEGER},
-      CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
-      UserName = #{row.userName,jdbcType=VARCHAR},
-      UserMobile = #{row.userMobile,jdbcType=VARCHAR},
-      CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
-      FrName = #{row.frName,jdbcType=VARCHAR},
-      ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
-      IsShortage = #{row.isShortage,jdbcType=INTEGER},
-      RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
-      CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
-      CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      Longitude = #{row.longitude,jdbcType=VARCHAR},
-      Latitude = #{row.latitude,jdbcType=VARCHAR},
-      openId = #{row.openId,jdbcType=VARCHAR}
+    SiteID = #{row.siteID,jdbcType=VARCHAR},
+    RegionCode = #{row.regionCode,jdbcType=VARCHAR},
+    InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
+    StreetCode = #{row.streetCode,jdbcType=VARCHAR},
+    CompanyName = #{row.companyName,jdbcType=VARCHAR},
+    CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
+    CompanyModel = #{row.companyModel,jdbcType=INTEGER},
+    WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
+    CompanyType = #{row.companyType,jdbcType=INTEGER},
+    CompanyAddress = #{row.companyAddress,jdbcType=VARCHAR},
+    UserName = #{row.userName,jdbcType=VARCHAR},
+    UserMobile = #{row.userMobile,jdbcType=VARCHAR},
+    CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
+    FrName = #{row.frName,jdbcType=VARCHAR},
+    ValidDate = #{row.validDate,jdbcType=TIMESTAMP},
+    IsShortage = #{row.isShortage,jdbcType=INTEGER},
+    RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
+    CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
+    CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
+    ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
+    ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+    Longitude = #{row.longitude,jdbcType=VARCHAR},
+    Latitude = #{row.latitude,jdbcType=VARCHAR},
+    openId = #{row.openId,jdbcType=VARCHAR},
+    EstablishmentTime = #{row.establishmentTime,jdbcType=TIMESTAMP},
+    SignInPoliticalArea = #{row.signInPoliticalArea,jdbcType=VARCHAR},
+    Website = #{row.website,jdbcType=VARCHAR},
+    Bonus = #{row.bonus,jdbcType=VARCHAR},
+    RegisteredCapital = #{row.registeredCapital,jdbcType=INTEGER},
+    ProfessionID = #{row.professionID,jdbcType=INTEGER},
+    EstateCategoryID = #{row.estateCategoryID,jdbcType=INTEGER},
+    TagID = #{row.tagID,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -578,65 +679,106 @@
       <if test="companyDesc != null">
         CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR},
       </if>
+      <if test="establishmentTime != null">
+        EstablishmentTime = #{establishmentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="signInPoliticalArea != null">
+        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+      </if>
+      <if test="website != null">
+        Website = #{website,jdbcType=VARCHAR},
+      </if>
+      <if test="bonus != null">
+        Bonus = #{bonus,jdbcType=VARCHAR},
+      </if>
+      <if test="registeredCapital != null">
+        RegisteredCapital = #{registeredCapital,jdbcType=INTEGER},
+      </if>
+      <if test="professionID != null">
+        ProfessionID = #{professionID,jdbcType=INTEGER},
+      </if>
+      <if test="estateCategoryID != null">
+        EstateCategoryID = #{estateCategoryID,jdbcType=INTEGER},
+      </if>
+      <if test="tagID != null">
+        TagID = #{tagID,jdbcType=INTEGER},
+      </if>
     </set>
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     update pc_company
-    set SiteID = #{siteID,jdbcType=VARCHAR},
-      RegionCode = #{regionCode,jdbcType=VARCHAR},
-      InsuredCount = #{insuredCount,jdbcType=INTEGER},
-      StreetCode = #{streetCode,jdbcType=VARCHAR},
-      CompanyName = #{companyName,jdbcType=VARCHAR},
-      CompanyCode = #{companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{companyModel,jdbcType=INTEGER},
-      WorkSituation = #{workSituation,jdbcType=VARCHAR},
-      CompanyType = #{companyType,jdbcType=INTEGER},
-      CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
-      UserName = #{userName,jdbcType=VARCHAR},
-      UserMobile = #{userMobile,jdbcType=VARCHAR},
-      CompanyEmail = #{companyEmail,jdbcType=VARCHAR},
-      FrName = #{frName,jdbcType=VARCHAR},
-      ValidDate = #{validDate,jdbcType=TIMESTAMP},
-      IsShortage = #{isShortage,jdbcType=INTEGER},
-      RecordStatus = #{recordStatus,jdbcType=INTEGER},
-      CreateUserID = #{createUserID,jdbcType=VARCHAR},
-      CreateTime = #{createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      Longitude = #{longitude,jdbcType=VARCHAR},
-      Latitude = #{latitude,jdbcType=VARCHAR},
-      openId = #{openId,jdbcType=VARCHAR},
-      BusinScope = #{businScope,jdbcType=LONGVARCHAR},
-      CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR}
+    set SiteID              = #{siteID,jdbcType=VARCHAR},
+        RegionCode          = #{regionCode,jdbcType=VARCHAR},
+        InsuredCount        = #{insuredCount,jdbcType=INTEGER},
+        StreetCode          = #{streetCode,jdbcType=VARCHAR},
+        CompanyName         = #{companyName,jdbcType=VARCHAR},
+        CompanyCode         = #{companyCode,jdbcType=VARCHAR},
+        CompanyModel        = #{companyModel,jdbcType=INTEGER},
+        WorkSituation       = #{workSituation,jdbcType=VARCHAR},
+        CompanyType         = #{companyType,jdbcType=INTEGER},
+        CompanyAddress      = #{companyAddress,jdbcType=VARCHAR},
+        UserName            = #{userName,jdbcType=VARCHAR},
+        UserMobile          = #{userMobile,jdbcType=VARCHAR},
+        CompanyEmail        = #{companyEmail,jdbcType=VARCHAR},
+        FrName              = #{frName,jdbcType=VARCHAR},
+        ValidDate           = #{validDate,jdbcType=TIMESTAMP},
+        IsShortage          = #{isShortage,jdbcType=INTEGER},
+        RecordStatus        = #{recordStatus,jdbcType=INTEGER},
+        CreateUserID        = #{createUserID,jdbcType=VARCHAR},
+        CreateTime          = #{createTime,jdbcType=TIMESTAMP},
+        ModifyUserID        = #{modifyUserID,jdbcType=VARCHAR},
+        ModifyTime          = #{modifyTime,jdbcType=TIMESTAMP},
+        Longitude           = #{longitude,jdbcType=VARCHAR},
+        Latitude            = #{latitude,jdbcType=VARCHAR},
+        openId              = #{openId,jdbcType=VARCHAR},
+        BusinScope          = #{businScope,jdbcType=LONGVARCHAR},
+        CompanyDesc         = #{companyDesc,jdbcType=LONGVARCHAR},
+        EstablishmentTime   = #{establishmentTime,jdbcType=TIMESTAMP},
+        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+        Website             = #{website,jdbcType=VARCHAR},
+        Bonus               = #{bonus,jdbcType=VARCHAR},
+        RegisteredCapital   = #{registeredCapital,jdbcType=INTEGER},
+        ProfessionID        = #{professionID,jdbcType=INTEGER},
+        EstateCategoryID    = #{estateCategoryID,jdbcType=INTEGER},
+        TagID               = #{tagID,jdbcType=INTEGER}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcCompany">
     update pc_company
-    set SiteID = #{siteID,jdbcType=VARCHAR},
-      RegionCode = #{regionCode,jdbcType=VARCHAR},
-      InsuredCount = #{insuredCount,jdbcType=INTEGER},
-      StreetCode = #{streetCode,jdbcType=VARCHAR},
-      CompanyName = #{companyName,jdbcType=VARCHAR},
-      CompanyCode = #{companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{companyModel,jdbcType=INTEGER},
-      WorkSituation = #{workSituation,jdbcType=VARCHAR},
-      CompanyType = #{companyType,jdbcType=INTEGER},
-      CompanyAddress = #{companyAddress,jdbcType=VARCHAR},
-      UserName = #{userName,jdbcType=VARCHAR},
-      UserMobile = #{userMobile,jdbcType=VARCHAR},
-      CompanyEmail = #{companyEmail,jdbcType=VARCHAR},
-      FrName = #{frName,jdbcType=VARCHAR},
-      ValidDate = #{validDate,jdbcType=TIMESTAMP},
-      IsShortage = #{isShortage,jdbcType=INTEGER},
-      RecordStatus = #{recordStatus,jdbcType=INTEGER},
-      CreateUserID = #{createUserID,jdbcType=VARCHAR},
-      CreateTime = #{createTime,jdbcType=TIMESTAMP},
-      ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      Longitude = #{longitude,jdbcType=VARCHAR},
-      Latitude = #{latitude,jdbcType=VARCHAR},
-      openId = #{openId,jdbcType=VARCHAR}
+    set SiteID              = #{siteID,jdbcType=VARCHAR},
+        RegionCode          = #{regionCode,jdbcType=VARCHAR},
+        InsuredCount        = #{insuredCount,jdbcType=INTEGER},
+        StreetCode          = #{streetCode,jdbcType=VARCHAR},
+        CompanyName         = #{companyName,jdbcType=VARCHAR},
+        CompanyCode         = #{companyCode,jdbcType=VARCHAR},
+        CompanyModel        = #{companyModel,jdbcType=INTEGER},
+        WorkSituation       = #{workSituation,jdbcType=VARCHAR},
+        CompanyType         = #{companyType,jdbcType=INTEGER},
+        CompanyAddress      = #{companyAddress,jdbcType=VARCHAR},
+        UserName            = #{userName,jdbcType=VARCHAR},
+        UserMobile          = #{userMobile,jdbcType=VARCHAR},
+        CompanyEmail        = #{companyEmail,jdbcType=VARCHAR},
+        FrName              = #{frName,jdbcType=VARCHAR},
+        ValidDate           = #{validDate,jdbcType=TIMESTAMP},
+        IsShortage          = #{isShortage,jdbcType=INTEGER},
+        RecordStatus        = #{recordStatus,jdbcType=INTEGER},
+        CreateUserID        = #{createUserID,jdbcType=VARCHAR},
+        CreateTime          = #{createTime,jdbcType=TIMESTAMP},
+        ModifyUserID        = #{modifyUserID,jdbcType=VARCHAR},
+        ModifyTime          = #{modifyTime,jdbcType=TIMESTAMP},
+        Longitude           = #{longitude,jdbcType=VARCHAR},
+        Latitude            = #{latitude,jdbcType=VARCHAR},
+        openId              = #{openId,jdbcType=VARCHAR},
+        EstablishmentTime   = #{establishmentTime,jdbcType=TIMESTAMP},
+        SignInPoliticalArea = #{signInPoliticalArea,jdbcType=VARCHAR},
+        Website             = #{website,jdbcType=VARCHAR},
+        Bonus               = #{bonus,jdbcType=VARCHAR},
+        RegisteredCapital   = #{registeredCapital,jdbcType=INTEGER},
+        ProfessionID        = #{professionID,jdbcType=INTEGER},
+        EstateCategoryID    = #{estateCategoryID,jdbcType=INTEGER},
+        TagID               = #{tagID,jdbcType=INTEGER}
+
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/cquery/CompanyCQuery.xml

@@ -4,10 +4,20 @@
     <select id="getList" resultType="com.hz.employmentsite.vo.companyService.CompanyVo">
         select company.*,city.name as regionName,area.name as streetName,sys_cmodel.Name as companyModelType,
         (select count(*) from pc_post where CompanyID=company.CompanyID) as postCount,u.`Name` as createUserName
-        ,inSites.InstitutionID as institutionID,site.SiteName
+        ,inSites.InstitutionID as institutionID,site.SiteName,com_status.Name as recordStatusName,
+        com_profession.Name as professionName, com_estate.Name as estateCategoryName,com_type.Name as companyTypeName
         from pc_company company
         left join sys_user u on u.UserID = company.CreateUserID
-        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyModel') sys_cmodel on company.CompanyModel = sys_cmodel.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyModel') sys_cmodel on
+        company.CompanyModel = sys_cmodel.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyType') com_type on
+        company.CompanyType = com_type.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyStatus') com_status on
+        company.RecordStatus = com_status.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyProfession') com_profession on
+        company.ProfessionID = com_profession.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyEstateCategory') com_estate on
+        company.EstateCategoryID = com_estate.Value
         left join area_code city on company.RegionCode = city.code
         left join area_code area on company.StreetCode = area.code
         left join pc_site site on company.siteID = site.siteID

vue/src/api/companyService/company.ts

@@ -14,11 +14,11 @@ export function getList(params: any) {
   );
 }
 
-export function getCompanyById(id: string) {
+export function getCompanyById(id: string, loginUserID: any) {
   return request({
     url: 'companyService/company/getCompanyByID',
     method: 'get',
-    params: {id}
+    params: {id, loginUserID}
   }, {
     isNew: true
   })

vue/src/api/jobUserManager/jobuser/index.ts

@@ -23,12 +23,12 @@ export function getJobUserDataList(){
   );
 }
 
-export function getDataById(id: any) {
+export function getDataById(id: any,loginUserID:any) {
   return request(
     {
       url: 'jobUserService/jobUser/getDataByID',
       method: 'get',
-      params: {id},
+      params: {id,loginUserID},
     },
     { isNew: true },
   );

vue/src/views/companyService/company/detail.vue

@@ -12,6 +12,16 @@
       <a-descriptions-item label="是否缺工">{{ companyInfo.isShortage == 0 ? '否' : '是' }}</a-descriptions-item>
       <a-descriptions-item label="企业所在经度">{{ companyInfo.longitude }}</a-descriptions-item>
       <a-descriptions-item label="企业所在纬度">{{ companyInfo.latitude }}</a-descriptions-item>
+      <a-descriptions-item label="企业成立日期">
+        {{ companyInfo.establishmentTime ? dayjs(companyInfo.establishmentTime).format('YYYY-MM-DD') : '' }}
+      </a-descriptions-item>
+      <a-descriptions-item label="注册资本">{{ companyInfo.registeredCapital }}万元</a-descriptions-item>
+      <a-descriptions-item label="注册地行政区划">{{ companyInfo.signInPoliticalArea }}</a-descriptions-item>
+      <a-descriptions-item label="所属行业">{{ companyInfo.professionName }}</a-descriptions-item>
+      <a-descriptions-item label="所属产业分类">{{ companyInfo.estateCategoryName }}</a-descriptions-item>
+      <a-descriptions-item label="企业标签">{{ companyInfo.tagName }}</a-descriptions-item>
+      <a-descriptions-item :span="3" label="官网网址">{{ companyInfo.website }}</a-descriptions-item>
+      <a-descriptions-item :span="3" label="企业福利">{{ companyInfo.bonus }}</a-descriptions-item>
     </a-descriptions>
     <a-divider orientation="left">附件照片</a-divider>
     <b-upload-file :fileRefId="companyInfo.companyID" :readonly="true" :multiple="true" style="width: 100%;"
@@ -23,7 +33,7 @@
         {{ companyInfo.validDate ? dayjs(companyInfo.validDate).format('YYYY-MM-DD') : '' }}
       </a-descriptions-item>
       <a-descriptions-item label="企业邮箱">{{ companyInfo.companyEmail }}</a-descriptions-item>
-      <a-descriptions-item label="企业分类">{{ companyInfo.companyType }}</a-descriptions-item>
+      <a-descriptions-item label="经济类型">{{ companyInfo.companyTypeName }}</a-descriptions-item>
       <a-descriptions-item label="所属县区">{{ companyInfo.regionName }}</a-descriptions-item>
       <a-descriptions-item label="所属街道">{{ companyInfo.streetName }}</a-descriptions-item>
       <a-descriptions-item label="企业规模">{{ companyInfo.companyModel }}</a-descriptions-item>
@@ -59,6 +69,7 @@ const companyInfo = reactive({
   validDate: "",
   companyEmail: "",
   companyType: "",
+  companyTypeName: "",
   regionName: "",
   streetName: "",
   companyModel: "",
@@ -66,13 +77,21 @@ const companyInfo = reactive({
   insuredCount: "",
   businScope: "",
   companyDesc: "",
+  establishmentTime: "",
+  registeredCapital: "",
+  signInPoliticalArea: "",
+  professionName: "",
+  estateCategoryName: "",
+  tagName: "",
+  website: "",
+  bonus: "",
 })
 // 文件数据
 const fileList = ref();
 
 // 数据加载
 function loadData(id: any) {
-  getCompanyById(id).then(result => {
+  getCompanyById(id, "").then(result => {
     Object.keys(companyInfo).forEach(key => {
       companyInfo[key] = result[key]
     })

vue/src/views/companyService/company/edit.vue

@@ -119,10 +119,97 @@
           >
             <a-input v-model:value="dataModel.latitude" placeholder=""/>
           </a-form-item>
-
         </a-col>
         <a-col :span="8">
-
+          <a-form-item
+            label="企业成立日期"
+            :label-col="{ span: 8 }"
+            name="establishmentTime"
+          >
+            <a-date-picker v-model:value="dataModel.establishmentTime" value-format="YYYY-MM-DD"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="注册资本"
+            :label-col="{ span: 8 }"
+            name="registeredCapital"
+          >
+            <a-input-number style="width: 100%" v-model:value="dataModel.registeredCapital" addon-after="万元"
+                            :controls="false"></a-input-number>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="注册地址行政区划"
+            :label-col="{ span: 8 }"
+            name="signInPoliticalArea"
+          >
+            <a-input v-model:value="dataModel.signInPoliticalArea"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="所属行业"
+            :label-col="{ span: 8 }"
+            name="professionID"
+          >
+            <a-select
+              ref="select"
+              v-model:value="dataModel.professionID"
+              :options="professionList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="所属产业分类"
+            :label-col="{ span: 8 }"
+            name="estateCategoryID"
+          >
+            <a-select
+              ref="select"
+              v-model:value="dataModel.estateCategoryID"
+              :options="estateCategoryList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="企业标签"
+            :label-col="{ span: 8 }"
+            name="tagID"
+          >
+            <a-select
+              ref="select"
+              v-model:value="dataModel.tagID"
+              :options="tagList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="官网网址"
+            :label-col="{ span: 8 }"
+            name="website"
+          >
+            <a-input v-model:value="dataModel.website"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item
+            label="企业福利"
+            :label-col="{ span: 8 }"
+            name="bonus"
+          >
+            <a-textarea v-model:value="dataModel.bonus" placeholder="" :rows="4"/>
+          </a-form-item>
         </a-col>
       </a-row>
       <a-divider orientation="left">附件图片上传</a-divider>
@@ -170,10 +257,10 @@
       <a-row>
         <a-col :span="8">
           <a-form-item
-            label="企业分类"
+            label="经济类型"
             :label-col="{ span: 8 }"
             name="companyType"
-            :rules="[{ required: false, message: '请选择企业分类!' }]"
+            :rules="[{ required: false, message: '请选择经济类型!' }]"
           >
             <a-select
               ref="select"
@@ -290,8 +377,10 @@ import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
 import {save, getCompanyById} from '@/api/companyService/company';
 import {getSiteByID, getSiteList} from '@/api/baseSettings/siteInfo';
 import {getSysDictionaryList} from '@/api/system/dictionary';
+import {getInfo} from '@/api/account';
 import dayjs from "dayjs";
 import {message} from "ant-design-vue";
+import {useUserStore} from "@/store/modules/user";
 
 interface FormState {
   dataModel: any;
@@ -301,6 +390,8 @@ export default defineComponent(
   {
     components: {BUploadFile},
     setup() {
+      const userStore = useUserStore();
+      const userInfo = ref(userStore.getUserInfo)
       const router = useRouter();
       const isAllowCommit = ref(true);
       const formState = reactive<FormState>({dataModel: {}});
@@ -316,10 +407,8 @@ export default defineComponent(
       //   let toDay = new Date();
       //   showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));
       // }
-      const companyStatusList = ref<SelectProps['options']>([
-        {value: 1, name: '在营'},
-        {value: 0, name: '停业'},
-      ]);
+      const companyStatusList = ref<SelectProps['options']>();
+      const estateCategoryList = ref<SelectProps['options']>();
       const shortageStatusList = ref<SelectProps['options']>([
         {value: 1, name: '是'},
         {value: 0, name: '否'},
@@ -366,6 +455,16 @@ export default defineComponent(
         // console.log("companyCategoryList", companyCategoryList.value);
       }
 
+      const getCompanyStatusList = async function () {
+        const data: any = await getSysDictionaryList("CompanyStatus");
+        companyStatusList.value = data;
+      }
+
+      const getEstateCategoryList = async function () {
+        const data: any = await getSysDictionaryList("CompanyEstateCategory");
+        estateCategoryList.value = data;
+      }
+
       const siteChange = async function () {
         const curSiteData: any = await getSiteByID(formState.dataModel.siteID);
         formState.dataModel.regionCode = curSiteData.regionCode;
@@ -413,7 +512,8 @@ export default defineComponent(
 
       const inputDataValidate = () =>{
         const mobileReg = /^1[3|4|5|6|7|8|9]\d{9}$/;
-        if(!mobileReg.test(formState.dataModel.userMobile)){
+        const landlineReg = /[0-9-()（）]{7,18}/;
+        if (!mobileReg.test(formState.dataModel.userMobile) && !landlineReg.test(formState.dataModel.userMobile)) {
           message.error("输入的联系电话有误!");
           isAllowCommit.value = false;
         }
@@ -454,15 +554,21 @@ export default defineComponent(
         getRegionList();
         getCompanyModelList();
         getCompanyTypeList();
-        getCompanyById(id).then(result => {
-          formState.dataModel = result;
-          // console.log("curDataModel",formState.dataModel);
-          showPicker.value = formState.dataModel.validDate == '2099-12-31T00:00:00.000+08:00' ? '1' : '2';
-          if (showPicker.value === '1')
-            showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));
-          else
-            showDateTime.value = formState.dataModel.validDate;
-        })
+        getCompanyStatusList();
+        getEstateCategoryList();
+        getInfo().then((loginUserInfo:any)=>{
+          console.log("userInfo",loginUserInfo.userID);
+          getCompanyById(id,loginUserInfo.userID).then(result => {
+            formState.dataModel = result;
+            // console.log("curDataModel",formState.dataModel);
+            showPicker.value = formState.dataModel.validDate == '2099-12-31T00:00:00.000+08:00' ? '1' : '2';
+            if (showPicker.value === '1')
+              showDateTime.value = dayjs(new Date().toLocaleDateString().replaceAll("/", "-"));
+            else
+              showDateTime.value = formState.dataModel.validDate;
+          })
+        });
+
       };
 
       return {
@@ -481,10 +587,12 @@ export default defineComponent(
         showDateTime,
         regionChange,
         setFileList,
-        shortageStatusList
+        shortageStatusList,
+        userInfo,
+        estateCategoryList
       }
     },
-    created() {
+    mounted() {
       const id = history.state.params?.id;
       this.loadData(id);
     }

vue/src/views/jobUserManager/jobhunt/edit.vue

@@ -15,13 +15,13 @@
           </a-form-item>
         </a-col>
       <a-col :span="8">
-        <a-form-item label="人才类型"  name="jobUserType" :label-col="{span:7}" :rules="[{ required: true, message: '请选择人才类型!' }]">
-          <label v-if="opCategory==3">{{dataModel.jobUserType }}</label>
-          <a-select  ref="select"  v-model:value="dataModel.jobUserType" :options="jobUserTypeList"
-                     :field-names="{label:'name',value:'value'}"  :allow-clear="true"  >
-          </a-select>
+        <a-form-item label="求职岗位"  name="professionName" :label-col="{span:7}" :rules="[{ required: true,message:'请选择求职岗位！' }]">
+          <!-- <label v-if="opCategory==3">{{dataModel.postID}}</label> -->
+          <a-cascader :load-data="loadLevelProfessionList" v-model:value="dataModel.professionName"
+                      :options="firstProfessionList" change-on-select>
+          </a-cascader>
         </a-form-item>
-        </a-col>
+      </a-col>
         <a-col :span="9">
           <a-form-item label="月薪要求" name="salary" style="overflow: hidden;line-height: 35px;height: 35px;" :label-col="{span:7}">
             <label style="color:red;float: left;position:relative;right:80px;line-height: 35px;" >*</label>
@@ -51,13 +51,15 @@
           </a-form-item>
         </a-col>
         <a-col :span="9">
-          <a-form-item label="求职岗位"  name="professionName" :label-col="{span:7}" :rules="[{ required: true,message:'请选择求职岗位！' }]">
-            <!-- <label v-if="opCategory==3">{{dataModel.postID}}</label> -->
-            <a-cascader :load-data="loadLevelProfessionList" v-model:value="dataModel.professionName"
-                        :options="firstProfessionList" change-on-select>
-            </a-cascader>
+
+          <a-form-item label="人才类型"  name="jobUserType" :label-col="{span:7}" :rules="[{ required: true, message: '请选择人才类型!' }]">
+            <label v-if="opCategory==3">{{dataModel.jobUserType }}</label>
+            <a-select  ref="select"  v-model:value="dataModel.jobUserType" :options="jobUserTypeList"
+                       :field-names="{label:'name',value:'value'}"  :allow-clear="true"  >
+            </a-select>
           </a-form-item>
         </a-col>
+
       </a-row>
       <a-row type="flex">
         <a-col :span="7">

vue/src/views/jobUserManager/jobuser/edit.vue

@@ -454,6 +454,7 @@ import {get} from "@/api/common";
 import {getSysDictionaryList} from '@/api/system/dictionary';
 import {getDataById, getEducationList, getExperienceList, save} from '@/api/jobUserManager/jobuser';
 import {getSiteList} from "@/api/baseSettings/siteInfo";
+import {getInfo} from "@/api/account";
 
 interface FormState {
   dataModel: any;
@@ -748,11 +749,13 @@ export default defineComponent(
         getKeyPersonTypeList();
         getMaritalStatusList();
         getPoliticsStatusList();
-        getDataById(id).then(data => {
-          formState.dataModel = data;
-          if (formState.dataModel.regionCode) {
-            changeCity();
-          }
+        getInfo().then((loginUserInfo:any)=>{
+          getDataById(id,loginUserInfo.userID).then(data => {
+            formState.dataModel = data;
+            if (formState.dataModel.regionCode) {
+              changeCity();
+            }
+          });
         });
       };