资金账户报表-->修改资金账户下拉框查询

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/ReportFormController.java

@@ -69,8 +69,8 @@ public class ReportFormController {
     @RequestMapping(method = RequestMethod.GET, value = "/queryTAAccountChildrenSelect")
     @ApiOperation("报表管理-->资金账户报表-->资金账户下拉列表")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    public AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode,Integer usertype, HttpServletRequest request) {
-        return iReportFormService.queryTAAccountChildrenSelect(searchcode,usertype,request);
+    public AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode,HttpServletRequest request) {
+        return iReportFormService.queryTAAccountChildrenSelect(searchcode,request);
     }
 
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IReportFormService.java

@@ -31,5 +31,5 @@ public interface IReportFormService {
 
     PageResult<ReckonDayaccountpp> accountppquery(TaAccountReportParam param, HttpServletRequest request);
 
-    AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode,Integer usertype, HttpServletRequest request);
+    AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode , HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/ReportFormServiceImpl.java

@@ -347,11 +347,10 @@ public class ReportFormServiceImpl implements IReportFormService {
     }
 
     @Override
-    public AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode, Integer usertype,HttpServletRequest request) {
+    public AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode ,HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        Long relateduserid = systemmanager.getAreauserid();
-        List<TAAccountChildrenSelect> result = iTaaccountMapper.queryChildren(searchcode,relateduserid,usertype);
-        return null;
+        List<TAAccountChildrenSelect> result = iTaaccountMapper.queryChildren(searchcode,systemmanager.getAreauserid());
+        return AjaxResult.success(Constants.Success_Code_Design, Constants.Deal_Success_Message, result);
     }
 
     private String formatDate(Integer cycletype, String cycletime, Integer quarter) {

mtp3-century/src/main/resources/mapper/TaaccountMapper.xml

@@ -280,9 +280,6 @@
             or ua.userid like '%' || #{searchcode} || '%'
             or ta.accountid like '%' || #{searchcode} || '%')
         </if>
-        <if test="usertype != null and usertype != '' ">
-            and ua.usertype = #{usertype}
-        </if>
         <if test="relateduserid != null and relateduserid != 1 ">
             START WITH ua.userid = #{relateduserid}
             CONNECT BY PRIOR ua.userid = ua.parentuserid

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ITaaccountMapper.java

@@ -36,5 +36,5 @@ public interface ITaaccountMapper extends BaseMapper<Taaccount> {
 
     List<RefUserResult> queryRefUserSelect(@Param("searchcode")String searchcode,@Param("refereeuserid") Long refereeuserid);
 
-    List<TAAccountChildrenSelect> queryChildren(@Param("searchcode") String searchcode, @Param("relateduserid") Long relateduserid, @Param("usertype") Integer usertype);
+    List<TAAccountChildrenSelect> queryChildren(@Param("searchcode") String searchcode, @Param("relateduserid") Long relateduserid);
 }