更改bug

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

@@ -7,7 +7,7 @@ import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3pojos.entity.Ipbacklist;
 import com.muchinfo.mtp3pojos.entity.Systemmanagerlog;
 import com.muchinfo.mtp3pojos.entity.WskhBlacklist;
-import com.muchinfo.mtp3pojos.vo.systemsetup.*;
+import com.muchinfo.mtp3pojos.vo.systemrun.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;

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

@@ -1,12 +1,34 @@
 package com.muchinfo.mtp3century.controller;
 
+import com.muchinfo.mtp3century.service.ISystemSetUpService;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.Systemparam;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 @Controller
 @RequestMapping("/setup")
 @Api(value = "基础数据API", description = "基础数据管理")
 public class SystemSetUpController {
 
+    @Resource
+    private ISystemSetUpService iSystemSetUpService;
+
+    @ApiOperation("基础数据管理-->系统参数管理-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryParam")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<Systemparam> query(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iSystemSetUpService.queryByPage(pageNum, pageSize, request);
+    }
+
+
 }

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

@@ -5,7 +5,7 @@ import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3pojos.entity.Ipbacklist;
 import com.muchinfo.mtp3pojos.entity.Systemmanagerlog;
 import com.muchinfo.mtp3pojos.entity.WskhBlacklist;
-import com.muchinfo.mtp3pojos.vo.systemsetup.*;
+import com.muchinfo.mtp3pojos.vo.systemrun.*;
 
 import javax.servlet.http.HttpServletRequest;
 

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

@@ -0,0 +1,10 @@
+package com.muchinfo.mtp3century.service;
+
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.Systemparam;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface ISystemSetUpService {
+    PageResult<Systemparam> queryByPage(Integer pageNum, Integer pageSize, HttpServletRequest request);
+}

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

@@ -378,7 +378,7 @@ public class CommonServiceImpl implements ICommonService {
 
     public boolean checkIsAreaSon2(Long fUserId, Long userid) {
         Useraccount u = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", userid));
-        return u.getSubarealevelpath().contains("," + fUserId + ",");
+        return u.getSubarealevelpath().indexOf("," + fUserId + ",") >= 0;
     }
 
     public Boolean checkOranCardNumOrMobile(int type, String message, Long userid) {

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

@@ -1194,6 +1194,7 @@ public class OrganServiceImpl implements IOrganService {
         ui.setCardtypeid(param.getCardtypeid());
         ui.setCityid(param.getCityid());
         ui.setCompany(param.getCompany());
+        ui.setCountryid(param.getCountryid());
         ui.setCustomername(param.getCustomername());
         ui.setDistrictid(param.getDistrictid());
         ui.setEmail(param.getEmail());

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

@@ -566,6 +566,7 @@ public class OrganSonServiceService implements IOrganSonService {
             dui.setCustomername(param.getCustomername());
         }
         dui.setDistrictid(param.getDistrictid());
+        dui.setCountryid(param.getCountryid());
         dui.setEmail(param.getEmail());
         dui.setMobile(param.getMobile());
         dui.setModifierid(systemmanager.getAutoid());
@@ -684,6 +685,7 @@ public class OrganSonServiceService implements IOrganSonService {
         ui.setCardnum(param.getCardnum());
         ui.setCardtypeid(param.getCardtypeid());
         ui.setCityid(param.getCityid());
+        ui.setCountryid(param.getCountryid());
         ui.setCompany(param.getCompany());
         ui.setCustomername(param.getCustomername());
         ui.setDistrictid(param.getDistrictid());

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

@@ -619,9 +619,9 @@ public class QueryServiceImpl implements IQueryService {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         PositionSheetResultDetail resultDetail = iTradeOrderdetailMapper.queryTradeHolderDetailById(ishis, tradeid, buyorsell, histradedate);
         if (iCommonService.checkTaAccountReport(systemmanager, resultDetail.getAccountid())) {
-            return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language"));
-        } else {
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), resultDetail);
+        } else {
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language"));
         }
     }
 
@@ -1548,7 +1548,7 @@ public class QueryServiceImpl implements IQueryService {
     public PageResult<HoldtransferQueryResult> holdtransferquery(HoldtransferQueryParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         //协议转让 平台、运营机构有权限，运营机构只查有权限的商品
-        if (!systemmanager.getReletype().equals(1)){
+        if (!systemmanager.getReletype().equals(1)) {
             // 非平台
             param.setYyareauserid(systemmanager.getAreauserid());
         }

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

@@ -18,7 +18,7 @@ import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3common.vo.ExportResult;
 import com.muchinfo.mtp3interface.mapper.*;
 import com.muchinfo.mtp3pojos.entity.*;
-import com.muchinfo.mtp3pojos.vo.systemsetup.*;
+import com.muchinfo.mtp3pojos.vo.systemrun.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

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

@@ -0,0 +1,49 @@
+package com.muchinfo.mtp3century.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.muchinfo.mtp3century.service.ICommonService;
+import com.muchinfo.mtp3century.service.ISystemSetUpService;
+import com.muchinfo.mtp3century.utils.AjaxResult;
+import com.muchinfo.mtp3common.enumtype.Constants;
+import com.muchinfo.mtp3common.enumtype.MessageType;
+import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3interface.mapper.ISystemmanagerMapper;
+import com.muchinfo.mtp3interface.mapper.ISystemparamMapper;
+import com.muchinfo.mtp3pojos.entity.Systemmanager;
+import com.muchinfo.mtp3pojos.entity.Systemparam;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+@Service
+
+public class SystemSetUpServiceImpl implements ISystemSetUpService {
+
+    @Resource
+    private ISystemmanagerMapper iSystemmanagerMapper;
+    @Resource
+    private ICommonService iCommonService;
+    @Resource
+    private ISystemparamMapper iSystemparamMapper;
+    @Override
+    public PageResult<Systemparam> queryByPage(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        IPage<Systemparam> page = new Page<>(pageNum, pageSize);
+        QueryWrapper<Systemparam> wrapper = new QueryWrapper<>();
+        if(systemmanager.getAutoid() > 0){
+            wrapper.eq("showflag",1);
+        }
+        IPage<Systemparam> queryResultIPage = iSystemparamMapper.selectPage(page, wrapper);
+        PageResult<Systemparam> result = new PageResult<>();
+        result.setCode(Constants.Success_Code_Design);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        result.setPages(queryResultIPage.getPages());
+        result.setCurrent(queryResultIPage.getCurrent());
+        result.setTotal(queryResultIPage.getTotal());
+        result.setPageSize(queryResultIPage.getSize());
+        result.setData(queryResultIPage.getRecords());
+        return result;
+    }
+}

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

@@ -219,13 +219,16 @@ public class SystemmanagerServiceImpl extends ServiceImpl<ISystemmanagerMapper,
 
     @Override
     public AjaxResult<SystemUserResResult> queryDetail(Integer autoId, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         StringBuilder stringBuilder = new StringBuilder();
         StringBuilder idStr = new StringBuilder();
         //基本信息
         Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("AUTOID", autoId));
         //是否有查询权限
         if (user.getReletype() != 1) {
-            return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language"));
+            if (!iCommonService.checkIsAreaSon2(systemmanager.getAreauserid(), user.getAreauserid())) {
+                return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language"));
+            }
         }
         SystemUserResResult userResResult = new SystemUserResResult();
         BeanUtils.copyProperties(user, userResResult);

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

@@ -742,6 +742,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         }
         dui.setDistrictid(param.getUserinfoDetailVo().getDistrictid());
         dui.setEmail(param.getUserinfoDetailVo().getEmail());
+        dui.setCountryid(param.getUserinfoDetailVo().getCountryid());
         dui.setHalfbodyphotourl(param.getUserinfoDetailVo().getHalfBodyPhotoUrl());
         dui.setMobile(param.getUserinfoDetailVo().getMobile());
         dui.setModifierid(systemmanager.getAutoid());

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

@@ -91,7 +91,7 @@
         order by s.logincode
     </select>
 
-    <select id="selectLogByParam" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogResult" parameterType="com.muchinfo.mtp3pojos.vo.systemsetup.SystemUserLogParam" >
+    <select id="selectLogByParam" resultType="com.muchinfo.mtp3pojos.vo.systemrun.SystemUserLogResult" parameterType="com.muchinfo.mtp3pojos.vo.systemrun.SystemUserLogParam" >
         select
         l.autoid,
         l.userid,
@@ -143,8 +143,8 @@
     </select>
 
 
-    <select id="queryUserLoginFlow" parameterType="com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorParam"
-            resultType="com.muchinfo.mtp3pojos.vo.systemsetup.SystemLoginErrorResult">
+    <select id="queryUserLoginFlow" parameterType="com.muchinfo.mtp3pojos.vo.systemrun.SystemLoginErrorParam"
+            resultType="com.muchinfo.mtp3pojos.vo.systemrun.SystemLoginErrorResult">
         select re.* from(
         select
         decode(f.clienttype,1,(case to_char(m.logincode||'-') when '-' then to_char(f.loginid) else m.logincode end ||(case to_char('('||m.username||')')when '()' then  '' ELSE to_char('('||m.username||')')end)),
@@ -242,7 +242,7 @@
         </where>
         order by t.loginstatus,t.loginid
     </select>
-    <select id="querymrsl" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.YmrslQueryResult">
+    <select id="querymrsl" resultType="com.muchinfo.mtp3pojos.vo.systemrun.YmrslQueryResult">
         select t.*,m.marketname "marketname" from MarketRunStatusLog t
         left join market m on t.marketid=m.marketid
         <where>
@@ -255,7 +255,7 @@
         </where>
         order by t.updatetime desc
     </select>
-    <select id="queryloginlog" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.LoginLogQueryResult">
+    <select id="queryloginlog" resultType="com.muchinfo.mtp3pojos.vo.systemrun.LoginLogQueryResult">
         select t.loginflowno "loginflowno",t.loginid "loginid",t.funcode "funcode",
         t.clienttype "clienttype",t.softversion "softversion",t.operatetime "operatetime",
         t.loginip "loginip",t.loginport "loginport",t.deviceid "deviceid",

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

@@ -81,6 +81,7 @@
         <result column="LEGALPERSONNAME" property="legalPersonName" />
         <result column="CONTACTNAME" property="contactName" />
         <result column="SEX" property="sex" />
+        <result column="COUNTRYID" property="countryid" />
         <result column="TELPHONE" property="telPhone" />
         <result column="MOBILE" property="mobile" />
         <result column="EMAIL" property="email" />

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

@@ -7,7 +7,7 @@ import com.muchinfo.mtp3pojos.vo.marketrun.MarketRunLoginUserResult;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountOrgan2UserResult;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountSelfsupportParam;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountSelfsupportResult;
-import com.muchinfo.mtp3pojos.vo.systemsetup.*;
+import com.muchinfo.mtp3pojos.vo.systemrun.*;
 import com.muchinfo.mtp3pojos.vo.systemuser.SystemUserReqParam;
 import com.muchinfo.mtp3pojos.vo.systemuser.SystemUserResResult;
 import org.apache.ibatis.annotations.Mapper;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/UserinfoDetailVo.java

@@ -57,6 +57,8 @@ public class UserinfoDetailVo {
     @Builder.Default
     private String address = "";
 
+    private Long countryid;
+
     private Long provinceid;
 
     private Long cityid;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/son/OrganAddSonOrganParam.java

@@ -78,6 +78,9 @@ public class OrganAddSonOrganParam {
     @ApiModelProperty(value = "联系电话 ")
     private String telphone;
 
+    @ApiModelProperty(value = "国家")
+    private Long countryid;
+
     @ApiModelProperty(value = "省 ")
     private Long provinceid;
 

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/BlackListAddParam.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/BlackListAddParam.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/IpListDelParam.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/IpListDelParam.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/LoginLogQueryParam.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/LoginLogQueryParam.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/LoginLogQueryResult.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/LoginLogQueryResult.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/SystemLoginErrorParam.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/SystemLoginErrorParam.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/SystemLoginErrorResult.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/SystemLoginErrorResult.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/SystemUserLogParam.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/SystemUserLogParam.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/SystemUserLogResult.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/SystemUserLogResult.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/YmrslQueryParam.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/YmrslQueryParam.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/YmrslQueryResult.java → mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemrun/YmrslQueryResult.java

@@ -1,4 +1,4 @@
-package com.muchinfo.mtp3pojos.vo.systemsetup;
+package com.muchinfo.mtp3pojos.vo.systemrun;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;