中扬CRM客户关系管理系统
#
luxiaotao1123
2022-11-08 1a06f9fd2091d0aadf0ea5a624dfca7f7b3b2102
#
2个文件已修改
34 ■■■■ 已修改文件
src/main/java/com/zy/crm/system/controller/UserController.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/cstmr/cstmr_more.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/crm/system/controller/UserController.java
@@ -2,20 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.result.KeyValueVo;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.RoleService;
import com.zy.crm.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -173,4 +175,26 @@
        return R.ok(result);
    }
    /*************************************** xm-select ***********************************************/
    // xm-select 搜索商品列表
    @RequestMapping("/user/all/get/kv")
    @ManagerAuth
    public R getUserDataKV(@RequestParam(required = false) String condition) {
        Wrapper<User> wrapper = new EntityWrapper<User>()
                .andNew().like("username", condition).or().like("nickname", condition)
                .orderBy("create_time", false);
        List<User> users = userService.selectPage(new Page<>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (User user : users) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(user.getNickname());
            vo.setValue(user.getId());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);
    }
}
src/main/webapp/views/cstmr/cstmr_more.html
@@ -326,7 +326,7 @@
                success: function (layero, dIndex) {
                    // let selectList = matXmSelect.getValue();
                    // 渲染物料选择
                    var matXmSelect = xmSelect.render({
                    var xmSelectIdx = xmSelect.render({
                        el: '#mat',
                        style: {
                            width: '280px',
@@ -337,7 +337,7 @@
                        remoteSearch: true,
                        remoteMethod: function(val, cb, show){
                            $.ajax({
                                url: baseUrl+"/mat/all/get/kv",
                                url: baseUrl+"/user/all/get/kv",
                                headers: {'token': localStorage.getItem('token')},
                                data: {
                                    condition: val