jyy
2021-09-11 a4694bf4e0384df517464624748b366f533fda0f
bug123
4 files modified
27 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/common/actions/SysCompanyAction.java 11 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/super/sysCompany-form.html 2 ●●● patch | view | raw | blame | history
zq-xcx/app.js 2 ●●● patch | view | raw | blame | history
zq-xcx/utils/util.js 12 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/SysCompanyAction.java
@@ -2,16 +2,13 @@
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.anotations.SaveRequestToken;
import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.constance.SystemMessageCode;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.InternationaUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.core.web.BaseAction;
import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.constance.AppVocabularyCode;
import com.matrix.system.common.init.InitWebContainer;
import com.matrix.system.common.service.SysCompanyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -35,6 +32,10 @@
    private SysCompanyService sysCompanyService;
    public static final String BEV = "SYSCOMPANY_BEV";
    @Autowired
    InitWebContainer initWebContainer;
    /**
     * 列表显示
@@ -80,6 +81,7 @@
    public @ResponseBody
    AjaxResult addCompany(SysCompany sysCompany) {
        int i = sysCompanyService.add(sysCompany);
        initWebContainer.initParams();
        if (i > 0) {
            return AjaxResult.buildSuccessInstance("创建成功");
        } else {
@@ -103,6 +105,7 @@
    AjaxResult modifyCompany(SysCompany sysCompany) {
        AjaxResult result = modify(sysCompanyService, WebUtil.getSessionAttribute(BEV), sysCompany,
                AppVocabularyCode.COMPANY);
        initWebContainer.initParams();
        WebUtil.removeSessionAttribute(BEV);
        return result;
    }
zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
@@ -72,7 +72,7 @@
            <div class="form-group">
                <label class="col-sm-2 control-label">网站地址</label>
                <div class="col-sm-4">
                    <input   type="text" dataType="url" class="form-control"
                    <input   type="text"  class="form-control"
                        ignore="ignore" th:value="${obj.comWebUrl }" name="comWebUrl"
                        nullmsg="网站不能为空">
                    <div class="Validform_checktip"></div>
zq-xcx/app.js
@@ -3,7 +3,7 @@
var api = require('utils/service-api.js');
App({
      baseUrl: "https://xcxhive2.jyymatrix.cc",
      baseUrl: "https://filehive2.jyymatrix.cc/xcxapi",
  //  baseUrl : "http://localhost:8080",
  //登录后获得的token
zq-xcx/utils/util.js
@@ -2,7 +2,7 @@
 * 通用js
 */
var debugHost='www.baidu.com';
var debugHost='taiyan';
// api地址,请求参数,回调函数,是否遮罩
function request(params) {
@@ -36,8 +36,8 @@
          method: "POST",
          header: {
            'content-type': 'application/json',
            'debugHost':debugHost
          //  'host':'www.jyymatrix.cc'
            //'debugHost':debugHost,
            'companyCode':'debugHost'
          },
          data: {},
          success: function(res) {
@@ -90,7 +90,7 @@
    method: option.method,
    header: {
      'content-type': 'application/json',
      'debugHost':debugHost,
      'companyCode':debugHost,
      'token': getApp().loginToken
    },
    data: data,
@@ -172,7 +172,7 @@
                header: {
                  "Content-Type": "multipart/form-data",
                  'token': res.data,
                  'debugHost':debugHost
                  'companyCode':debugHost
                },
                formData: formData,
                success: function(e) {
@@ -303,7 +303,7 @@
        method: "POST",
        header: {
          'content-type': 'application/json',
          'debugHost':debugHost
          'companyCode':debugHost
        },
        data: {},
        success: function(res) {