Przeglądaj źródła

人员与公司 副绑定

jz.kai 5 lat temu
rodzic
commit
22d477d5d5

+ 6 - 2
common/src/main/resources/mapper/base/PersonCompany.xml

@@ -80,8 +80,12 @@ id_,person_id,company_id,del_flag,create_by,create_time,update_by,update_time		f
 			select * from base_person_company
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			and del_flag = false
+			<if test="searchParams.personId != null">
+				and person_id = #{searchParams.personId}
+			</if>
+			<if test="searchParams.companyId != null">
+				and company_id = #{searchParams.companyId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

+ 31 - 1
web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonCompanyController.java

@@ -193,7 +193,7 @@ public class PersonCompanyController {
         return msgResult;
     }
 
-    @ApiOperation(value="列表")
+    @ApiOperation(value="分页列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
             String id,
@@ -222,4 +222,34 @@ public class PersonCompanyController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<List<PersonCompany>> list(
+            @RequestParam(value="personId",defaultValue="") String personId,
+            @RequestParam(value="companyId",defaultValue="") String companyId,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<List<PersonCompany>> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+        if (StringUtils.isNotEmpty(personId)) {
+            searchParams.put("personId", personId);
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            searchParams.put("companyId", companyId);
+        }
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        Page<PersonCompany> page = personCompanyService.pageSearch(searchParams,1,1000,false,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
 }