Merge remote-tracking branch 'origin/f-6.7.2.1' into f-6.7.2

src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java

@@ -227,7 +227,8 @@ public class VoucherRuleController {
     @RequestMapping(value = "addVourcherRoleUsers", method = RequestMethod.POST)
     @RequestMapping(value = "addVourcherRoleUsers", method = RequestMethod.POST)
     public String addVourcherRoleUsers(HttpServletRequest request, int id, String userids,
     public String addVourcherRoleUsers(HttpServletRequest request, int id, String userids,
             RedirectAttributes redirectAttributes) {
             RedirectAttributes redirectAttributes) {
-        Response<Boolean> response = voucherRuleService.addVourcherRoleUsers(id, userids);
+    	int type = 1;
+        Response<Boolean> response = voucherRuleService.addVourcherRoleUsers(id, userids,SpringSecurityUtil.getCurrentUserName(),type);
         String message = "新增发放用户失败!";
         String message = "新增发放用户失败!";
         if (response != null && response.getMessage() != null) {
         if (response != null && response.getMessage() != null) {
             message = response.getMessage();
             message = response.getMessage();

src/main/java/com/ctrip/fun/admin/service/basic/VoucherRuleService.java

@@ -141,10 +141,10 @@ public class VoucherRuleService extends BaseService {
      * @param id
      * @param id
      * @param userIds
      * @param userIds
      */
      */
-    public Response<Boolean>  addVourcherRoleUsers(int id, String userids) {
+    public Response<Boolean>  addVourcherRoleUsers(int id, String userids,String loginUserName,int type) {
         String uri = super.getServiceUri("uri.voucherRule.addVoucherRoleUsers").replace("{id}",
         String uri = super.getServiceUri("uri.voucherRule.addVoucherRoleUsers").replace("{id}",
                 String.valueOf(id));
                 String.valueOf(id));
-        Request<String> request = new Request<String>("", userids);
+        Request<String> request = new Request<String>("", userids,loginUserName,type);
         HttpEntity<Request<String>> entity = new HttpEntity<Request<String>>(request);
         HttpEntity<Request<String>> entity = new HttpEntity<Request<String>>(request);
         Response<Boolean> response = super.exchange(uri, HttpMethod.POST, entity,
         Response<Boolean> response = super.exchange(uri, HttpMethod.POST, entity,
                 new ParameterizedTypeReference<Response<Boolean>>() {
                 new ParameterizedTypeReference<Response<Boolean>>() {

src/main/webapp/WEB-INF/templates/system/UserInfoDetail.ftl

@@ -653,9 +653,9 @@ $(function() {
             	</form>
             	</form>
             </td>
             </td>
            
            
-            <td>
+            <!--<td>
             	<input id = 'voucherId' class='delete-all-check' type='checkbox' name='checkbox'/>
             	<input id = 'voucherId' class='delete-all-check' type='checkbox' name='checkbox'/>
-            </td>
+            </td>-->
         </tr>
         </tr>
     </#list>
     </#list>
 </table></div>
 </table></div>