From ebc3c05e53bf6336c216dc334d7ff4639f5b9b61 Mon Sep 17 00:00:00 2001
From: "459816669@qq.com" <459816669@qq.com>
Date: Thu, 4 Nov 2021 22:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E9=83=A8=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/dingtalk/ExtContactUserController.java | 7 ++++---
 .../main/resources/templates/ding/extContactUser/add.html | 4 ++--
 .../resources/templates/ding/extContactUser/detail.html   | 3 +--
 .../resources/templates/ding/extContactUser/edit.html     | 4 ++--
 .../templates/ding/extContactUser/extContactUser.html     | 8 ++++----
 .../dingtalk/model/request/ExtContactUserRequest.java     | 2 +-
 .../dingtalk/service/impl/ExtContactUserServiceImpl.java  | 1 +
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/snow-admin/src/main/java/com/snow/web/controller/dingtalk/ExtContactUserController.java b/snow-admin/src/main/java/com/snow/web/controller/dingtalk/ExtContactUserController.java
index 8272add..388f685 100644
--- a/snow-admin/src/main/java/com/snow/web/controller/dingtalk/ExtContactUserController.java
+++ b/snow-admin/src/main/java/com/snow/web/controller/dingtalk/ExtContactUserController.java
@@ -45,6 +45,7 @@ public class ExtContactUserController extends BaseController {
 
     @RequiresPermissions("system:extContactUser:list")
     @PostMapping("/list")
+    @ResponseBody
     public TableDataInfo getList() {
         startPage();
         List<ExtContactUserRequest> extContactUserList = extContactUserService.getExtContactUserList(null,null);
@@ -70,10 +71,10 @@ public class ExtContactUserController extends BaseController {
     }
 
     @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") String userId, ModelMap mmap)
+    public String edit(@PathVariable("id") String userid, ModelMap mmap)
     {
-        ExtContactUserRequest extContactUserDetail = extContactUserService.getExtContactUserDetail(userId);
-        SysUser sysUser = userService.selectUserByDingUserId(userId);
+        ExtContactUserRequest extContactUserDetail = extContactUserService.getExtContactUserDetail(userid);
+        SysUser sysUser = userService.selectUserByDingUserId(userid);
         if(ObjectUtil.isNotNull(sysUser)){
             extContactUserDetail.setFollowerUserId(sysUser.getUserName());
         }
diff --git a/snow-admin/src/main/resources/templates/ding/extContactUser/add.html b/snow-admin/src/main/resources/templates/ding/extContactUser/add.html
index 3c08dd8..6f32e0a 100644
--- a/snow-admin/src/main/resources/templates/ding/extContactUser/add.html
+++ b/snow-admin/src/main/resources/templates/ding/extContactUser/add.html
@@ -92,7 +92,7 @@
                             <div class="row" th:each="dict : ${label}">
                                 <label class="col-xs-2 control-label" th:text="${dict.name}"></label>
                                 <div class="radio-box" th:each="label : ${dict.labels}">
-                                    <input type="radio" th:id="${'faqType_' + label.id}" name="labelIds" th:value="${label.name}">
+                                    <input type="radio" th:id="${'faqType_' + label.id}" name="labelIds" th:value="${label.id}">
                                     <label th:for="${'faqType_' + label.id}" th:text="${label.name}"></label>
                                 </div>
                             </div>
@@ -122,7 +122,7 @@
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: select2-js" />
 	<script>
-	    var prefix = ctx + "/ding/extContactUser";
+	    var prefix = ctx + "ding/extContactUser";
         
         function submitHandler() {
 	        if ($.validate.form()) {
diff --git a/snow-admin/src/main/resources/templates/ding/extContactUser/detail.html b/snow-admin/src/main/resources/templates/ding/extContactUser/detail.html
index 1480595..b1bb279 100644
--- a/snow-admin/src/main/resources/templates/ding/extContactUser/detail.html
+++ b/snow-admin/src/main/resources/templates/ding/extContactUser/detail.html
@@ -6,7 +6,6 @@
 <body class="white-bg">
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 	<form class="form-horizontal m-t" id="signupForm">
-		<h4 class="form-header h4">基本信息</h4>
 		<div class="form-group">
 			<label class="col-sm-3 control-label">姓名：</label>
 			<div class="form-control-static"  th:text="${extContactUser.name}">
@@ -34,7 +33,7 @@
 		</div>
 		<div class="form-group">
 			<label class="col-sm-3 control-label">备注：</label>
-			<div class="form-control-static" th:text="${sysOaLeave.remark}">
+			<div class="form-control-static" th:text="${extContactUser.remark}">
 			</div>
 		</div>
 	</form>
diff --git a/snow-admin/src/main/resources/templates/ding/extContactUser/edit.html b/snow-admin/src/main/resources/templates/ding/extContactUser/edit.html
index f29ac3b..26f1e47 100644
--- a/snow-admin/src/main/resources/templates/ding/extContactUser/edit.html
+++ b/snow-admin/src/main/resources/templates/ding/extContactUser/edit.html
@@ -7,7 +7,7 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-dept-edit" th:object="${extContactUser}">
 			<h4 class="form-header h4">基本信息</h4>
-			<input class="form-control" type="hidden" name="userId" th:field="*{userId}">
+			<input class="form-control" type="hidden" name="userId" th:field="*{userid}">
 			<div class="row">
 				<div class="col-sm-6">
 					<div class="form-group">
@@ -98,7 +98,7 @@
 	</div>
 	<th:block th:include="include :: footer" />
 	<script type="text/javascript">
-		var prefix = ctx + "/ding/extContactUser";
+		var prefix = ctx + "ding/extContactUser";
 
 		function submitHandler() {
 	        if ($.validate.form()) {
diff --git a/snow-admin/src/main/resources/templates/ding/extContactUser/extContactUser.html b/snow-admin/src/main/resources/templates/ding/extContactUser/extContactUser.html
index a825f22..c19e348 100644
--- a/snow-admin/src/main/resources/templates/ding/extContactUser/extContactUser.html
+++ b/snow-admin/src/main/resources/templates/ding/extContactUser/extContactUser.html
@@ -59,7 +59,7 @@
                     printIgnore: true
                 },
                 {
-                    field: 'userId',
+                    field: 'userid',
                     title: '用户id',
                     visible: false,
                     printIgnore: true
@@ -86,9 +86,9 @@
                     printIgnore: true,
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.userId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.userId + '\')"><i class="fa fa-search-plus"></i>详情</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.userid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.userid + '\')"><i class="fa fa-search-plus"></i>详情</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userid + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
diff --git a/snow-dingtalk/src/main/java/com/snow/dingtalk/model/request/ExtContactUserRequest.java b/snow-dingtalk/src/main/java/com/snow/dingtalk/model/request/ExtContactUserRequest.java
index 53d3ef2..aff11d2 100644
--- a/snow-dingtalk/src/main/java/com/snow/dingtalk/model/request/ExtContactUserRequest.java
+++ b/snow-dingtalk/src/main/java/com/snow/dingtalk/model/request/ExtContactUserRequest.java
@@ -22,7 +22,7 @@ public class ExtContactUserRequest implements Serializable {
     /**
      * 用户id
      */
-    private String userId;
+    private String userid;
     /**
      * 地址
      */
diff --git a/snow-dingtalk/src/main/java/com/snow/dingtalk/service/impl/ExtContactUserServiceImpl.java b/snow-dingtalk/src/main/java/com/snow/dingtalk/service/impl/ExtContactUserServiceImpl.java
index ef0d7bb..4bddc90 100644
--- a/snow-dingtalk/src/main/java/com/snow/dingtalk/service/impl/ExtContactUserServiceImpl.java
+++ b/snow-dingtalk/src/main/java/com/snow/dingtalk/service/impl/ExtContactUserServiceImpl.java
@@ -39,6 +39,7 @@ public class ExtContactUserServiceImpl extends BaseService implements ExtContact
         DingTalkClient client = new DefaultDingTalkClient(BaseConstantUrl.CREATE_EXT_CONTACT_USER);
         OapiExtcontactCreateRequest req = new OapiExtcontactCreateRequest();
         OapiExtcontactCreateRequest.OpenExtContact  contact = BeanUtil.copyProperties(extContactUserRequest, OapiExtcontactCreateRequest.OpenExtContact .class);
+        contact.setStateCode("86");
         req.setContact(contact);
         try {
             OapiExtcontactCreateResponse rsp = client.execute(req, getDingTalkToken());