dcs há 1 mês atrás
pai
commit
352dc31aef

+ 1 - 1
virgo.core/src/main/java/com/bosshand/virgo/core/controller/CustomerController.java

@@ -56,7 +56,7 @@ public class CustomerController {
     public Response update(@RequestBody Customer customer) {
         Customer c = customerService.getOrganizationId(customer.getOrganizationId(), customer.getUserId());
         if(c != null){
-            return Response.fail(20000, "组织下已经指定过客服了");
+            return Response.fail(20000, "组织下已经指定过该用户为客服了");
         }
         customerService.update(customer);
         return Response.ok();

+ 1 - 1
virgo.core/src/main/resources/mapper/CustomerMapper.xml

@@ -14,7 +14,7 @@
     </resultMap>
 
     <select id="getOrganizationId" resultMap="result">
-        select * from customer where organizationId = #{organizationId} and userId = #{userId}
+        select * from customer where organizationId = #{organizationId} and userId = #{userId} and isDelete != 1
     </select>
 
     <sql id="query">